diff options
| -rw-r--r-- | docs/Doxyfile | 2 | ||||
| -rw-r--r-- | docs/src/concepts.dox | 2 | ||||
| -rw-r--r-- | docs/src/interrupts.dox | 2 | ||||
| -rw-r--r-- | docs/src/saveram.dox | 3 | ||||
| -rw-r--r-- | docs/src/timing.dox | 2 | ||||
| -rw-r--r-- | readme.txt | 5 | ||||
| -rw-r--r-- | src/include/ch.h | 6 |
7 files changed, 14 insertions, 8 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile index 5505c9ff0..482fae3d9 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.1.3unstable +PROJECT_NUMBER = 1.2.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/docs/src/concepts.dox b/docs/src/concepts.dox index cc768052e..725be9b52 100644 --- a/docs/src/concepts.dox +++ b/docs/src/concepts.dox @@ -34,7 +34,7 @@ * @section naming Naming Conventions
* ChibiOS/RT APIs are all named following this convention:
* @a ch\<group\>\<action\>\<suffix\>().
- * The possible groups are: @a Sys, @a Sch, @a Time @a VT, @a Thd, @a Sem,
+ * The possible groups are: @a Sys, @a Sch, @a Time, @a VT, @a Thd, @a Sem,
* @a Mtx, @a Cond, @a Evt, @a Msg, @a IQ, @a OQ, @a HQ, @a FDD, @a HDD,
* @a Dbg, @a Heap, @a Pool.
*
diff --git a/docs/src/interrupts.dox b/docs/src/interrupts.dox index 679eb8884..d2dfb70b5 100644 --- a/docs/src/interrupts.dox +++ b/docs/src/interrupts.dox @@ -20,7 +20,7 @@ /**
* @page article_interrupts Writing interrupt handlers under ChibiOS/RT
* @{
- * Since version 1.1.0 ChbiOS/RT offers a cross-platform system for writing
+ * Since version 1.1.0 ChibiOS/RT offers a cross-platform method for writing
* interrupt handlers. Port-related and compiler-related details are
* encapsulated within standard system macros.<br>
* An interrupt handler assumes the following general form:
diff --git a/docs/src/saveram.dox b/docs/src/saveram.dox index e237da909..7a1f6f662 100644 --- a/docs/src/saveram.dox +++ b/docs/src/saveram.dox @@ -71,7 +71,8 @@ static void MyThread(void *arg) { main() {
chSysInit();
...
- chThdCreateStatic(waMyThread, sizeof(waMyThread), NORMALPRIO, MyThread, NULL);
+ chThdCreateStatic(waMyThread, sizeof(waMyThread), NORMALPRIO,
+ (tfunc_t)MyThread, NULL);
...
}
* @endcode
diff --git a/docs/src/timing.dox b/docs/src/timing.dox index 7732bef0b..9e013c412 100644 --- a/docs/src/timing.dox +++ b/docs/src/timing.dox @@ -39,7 +39,7 @@ msg_t my_thread(void *param) { * executed at irregular intervals, as example:<br><br>
* T0...T0+1000...T0+2002...T0+3002...T0+4005...etc.<br><br>
* Also note that the error increases over time and this kind of behavior can
- * lead anomalies really hard to debug.
+ * lead to anomalies really hard to debug.
* <h2>A better solution</h2>
* It is possible to rewrite the above code using absolute deadlines rather
* than fixed intervals:
diff --git a/readme.txt b/readme.txt index ba22f958c..e12e5163e 100644 --- a/readme.txt +++ b/readme.txt @@ -71,6 +71,11 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process, *****************************************************************************
*** Releases ***
*****************************************************************************
+
+*** 1.2.0 ***
+- Added license exception text to the 1.2.0 branch.
+- Full test cycle and test reports updated.
+- Small fixes to the documentation.
*** 1.1.3unstable *** - FIX: Fixed makefile in STM32 demo, this bug was reported fixed in diff --git a/src/include/ch.h b/src/include/ch.h index 6ac7a4cbb..94dcf8fa0 100644 --- a/src/include/ch.h +++ b/src/include/ch.h @@ -35,7 +35,7 @@ /**
* Kernel version string. */
-#define CH_KERNEL_VERSION "1.1.3unstable"
+#define CH_KERNEL_VERSION "1.2.0"
/**
* Kernel version major number. @@ -45,12 +45,12 @@ /**
* Kernel version minor number. */
-#define CH_KERNEL_MINOR 1
+#define CH_KERNEL_MINOR 2
/**
* Kernel version patch number. */
-#define CH_KERNEL_PATCH 3
+#define CH_KERNEL_PATCH 0
/*
* Common values.
|