diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-07-15 12:47:29 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-07-15 12:47:29 +0000 |
commit | 577f267dda280e46805275fca1722bf5dd112414 (patch) | |
tree | 43e2b1eabf1ea68f736c5063e674f62cb7c1af4e | |
parent | 5ebfb65f686ba28c13258c77d52560c1299aa442 (diff) | |
download | ChibiOS-577f267dda280e46805275fca1722bf5dd112414.tar.gz ChibiOS-577f267dda280e46805275fca1722bf5dd112414.tar.bz2 ChibiOS-577f267dda280e46805275fca1722bf5dd112414.zip |
Fixed bug #617.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8102 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | os/hal/ports/STM32/STM32L0xx/hal_lld.h | 8 | ||||
-rw-r--r-- | os/hal/ports/STM32/STM32L1xx/hal_lld.h | 2 | ||||
-rw-r--r-- | readme.txt | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/os/hal/ports/STM32/STM32L0xx/hal_lld.h b/os/hal/ports/STM32/STM32L0xx/hal_lld.h index 1d707ccaa..6c726b96e 100644 --- a/os/hal/ports/STM32/STM32L0xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L0xx/hal_lld.h @@ -97,9 +97,9 @@ #define STM32_PLS_EXT (7 << 5) /**< PVD level 7. */
#define STM32_VOS_MASK (3 << 11) /**< VOS field mask. */
-#define STM32_VOS_RANGE1 (1 << 11) /**< VOS level 1.8 volts. */
-#define STM32_VOS_RANGE2 (2 << 11) /**< VOS level 1.5 volts. */
-#define STM32_VOS_RANGE3 (3 << 11) /**< VOS level 1.2 volts. */
+#define STM32_VOS_1P8 (1 << 11) /**< VOS level 1.8 volts. */
+#define STM32_VOS_1P5 (2 << 11) /**< VOS level 1.5 volts. */
+#define STM32_VOS_1P2 (3 << 11) /**< VOS level 1.2 volts. */
/** @} */
/**
@@ -316,7 +316,7 @@ /**
* @brief Enables or disables the LSE clock source.
*/
-#if !defined(STM32_HSE_ENABLED) || defined(__DOXYGEN__)
+#if !defined(STM32_LSE_ENABLED) || defined(__DOXYGEN__)
#define STM32_LSE_ENABLED FALSE
#endif
diff --git a/os/hal/ports/STM32/STM32L1xx/hal_lld.h b/os/hal/ports/STM32/STM32L1xx/hal_lld.h index f3e9bfd08..93f6e02bc 100644 --- a/os/hal/ports/STM32/STM32L1xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32L1xx/hal_lld.h @@ -244,7 +244,7 @@ /**
* @brief Enables or disables the LSE clock source.
*/
-#if !defined(STM32_HSE_ENABLED) || defined(__DOXYGEN__)
+#if !defined(STM32_LSE_ENABLED) || defined(__DOXYGEN__)
#define STM32_LSE_ENABLED FALSE
#endif
diff --git a/readme.txt b/readme.txt index 67fed6e9b..e24782272 100644 --- a/readme.txt +++ b/readme.txt @@ -75,7 +75,11 @@ *** 3.1.0 ***
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
- for STM32F030xC, STM32F070x6, STM32F070xB devices.
+ for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- HAL: Fixed wrong check on STM32_LSE_ENABLED definition in STM32L1xx HAL port
+ (bug #617)(backported to 3.0.0 and 2.6.9).
+- HAL: Fixed rtcConvertDateTimeToFAT() incorrect conversion (bug #615)
+ (backported to 3.0.0).
*** 3.0.0 ***
- NEW: Added an initialization function to the lwIP bindings, now it is
|