diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-09 18:09:20 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-09 18:09:20 +0000 |
| commit | 8f86368f15cc28d4879a50ec8d4d6f8139e4d57a (patch) | |
| tree | 49cbd13c4b4038b36633840999fb57b4585783be | |
| parent | 7db9cb86d06c725387bca9b89a7dd849f7c46142 (diff) | |
| download | ChibiOS-8f86368f15cc28d4879a50ec8d4d6f8139e4d57a.tar.gz ChibiOS-8f86368f15cc28d4879a50ec8d4d6f8139e4d57a.tar.bz2 ChibiOS-8f86368f15cc28d4879a50ec8d4d6f8139e4d57a.zip | |
Fixed bug 3153746.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2632 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103/mcuconf.h | 2 | ||||
| -rw-r--r-- | docs/Doxyfile | 2 | ||||
| -rw-r--r-- | os/kernel/include/ch.h | 4 | ||||
| -rw-r--r-- | readme.txt | 9 |
4 files changed, 9 insertions, 8 deletions
diff --git a/demos/ARMCM3-STM32F103/mcuconf.h b/demos/ARMCM3-STM32F103/mcuconf.h index e5ccc2584..4e640b93f 100644 --- a/demos/ARMCM3-STM32F103/mcuconf.h +++ b/demos/ARMCM3-STM32F103/mcuconf.h @@ -37,7 +37,7 @@ #define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSE
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
-#define STM32_PLLMUL_VALUE 6
+#define STM32_PLLMUL_VALUE 9
#define STM32_HPRE STM32_HPRE_DIV1
#define STM32_PPRE1 STM32_PPRE1_DIV2
#define STM32_PPRE2 STM32_PPRE2_DIV2
diff --git a/docs/Doxyfile b/docs/Doxyfile index 5a61308cf..08f65b949 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 = 2.1.7 +PROJECT_NUMBER = 2.1.8 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 7a922d02a..acbba14a2 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -39,7 +39,7 @@ /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.1.7unstable"
+#define CH_KERNEL_VERSION "2.1.8unstable"
/**
* @brief Kernel version major number.
@@ -54,7 +54,7 @@ /**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 7
+#define CH_KERNEL_PATCH 8
/*
* Common values.
diff --git a/readme.txt b/readme.txt index 5b49ca75b..0b009ddc0 100644 --- a/readme.txt +++ b/readme.txt @@ -64,6 +64,9 @@ *** Releases ***
*****************************************************************************
+*** 2.1.8 ***
+- FIX: Fixed STM32F103 demo's incorrect clock settings (bug 3153746).
+
*** 2.1.7 ***
- FIX: Fixed various errors in the HAL documentation (bug 3153591).
- FIX: Fixed error in chIOGetxxxxxEventSource() macros (bug 3153550)
@@ -76,8 +79,7 @@ (backported to 2.0.9).
- FIX: Fixed extra notifications in input queues (bug 3148525)(backported
to 2.0.9).
-- NEW: New ARM Cortex-Mx port for RVCT compiler (probably will not be
- included in 2.2.0, requires more testing).
+- NEW: New ARM Cortex-Mx port for RVCT compiler.
- NEW: Integrated the various Cortex-Mx GCC, IAR and RVCT demos in unified
demos with multiple project files, the code is exactly the same. Renamed
the directories removing the compiler suffix.
@@ -106,8 +108,7 @@ *** 2.1.6 ***
- FIX: Fixed error in sdPutTimeout() macro (bug 3138763)(backported in 2.0.9).
-- NEW: New ARM Cortex-Mx port for IAR compiler (probably will not be
- included in 2.2.0, requires more testing).
+- NEW: New ARM Cortex-Mx port for IAR compiler.
- NEW: Now the STM32 CAN driver puts the lower half word of the ESR
register in the upper half word of the can status word for easier
debug.
|