diff options
| -rw-r--r-- | os/hal/platforms/STM32/hal_lld_f103.h | 13 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/hal_lld_f105_f107.h | 18 | ||||
| -rw-r--r-- | readme.txt | 2 |
3 files changed, 28 insertions, 5 deletions
diff --git a/os/hal/platforms/STM32/hal_lld_f103.h b/os/hal/platforms/STM32/hal_lld_f103.h index 9c6541231..50dc8cf0a 100644 --- a/os/hal/platforms/STM32/hal_lld_f103.h +++ b/os/hal/platforms/STM32/hal_lld_f103.h @@ -325,18 +325,21 @@ #endif
/**
- * @brief Timers clocks.
+ * @brief Timers 2, 3, 4, 5, 6, 7, 12, 13, 14 clock.
*/
#if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__)
-#define STM32_TIMCLK1 (STM32_PCLK1 * 1)
+#define STM32_TIMCLK1 (STM32_PCLK1 * 1)
#else
-#define STM32_TIMCLK1 (STM32_PCLK1 * 2)
+#define STM32_TIMCLK1 (STM32_PCLK1 * 2)
#endif
+/**
+ * @brief Timers 1, 8, 9, 10 and 11 clock.
+ */
#if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__)
-#define STM32_TIMCLK2 (STM32_PCLK2 * 1)
+#define STM32_TIMCLK2 (STM32_PCLK2 * 1)
#else
-#define STM32_TIMCLK2 (STM32_PCLK2 * 2)
+#define STM32_TIMCLK2 (STM32_PCLK2 * 2)
#endif
/**
diff --git a/os/hal/platforms/STM32/hal_lld_f105_f107.h b/os/hal/platforms/STM32/hal_lld_f105_f107.h index 2eba312c5..1e2b6f62f 100644 --- a/os/hal/platforms/STM32/hal_lld_f105_f107.h +++ b/os/hal/platforms/STM32/hal_lld_f105_f107.h @@ -427,6 +427,24 @@ #endif
/**
+ * @brief Timers 2, 3, 4, 5, 6, 7 clock.
+ */
+#if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__)
+#define STM32_TIMCLK1 (STM32_PCLK1 * 1)
+#else
+#define STM32_TIMCLK1 (STM32_PCLK1 * 2)
+#endif
+
+/**
+ * @brief Timer 1 clock.
+ */
+#if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__)
+#define STM32_TIMCLK2 (STM32_PCLK2 * 1)
+#else
+#define STM32_TIMCLK2 (STM32_PCLK2 * 2)
+#endif
+
+/**
* @brief Flash settings.
*/
#if (STM32_HCLK <= 24000000) || defined(__DOXYGEN__)
diff --git a/readme.txt b/readme.txt index 2492c3c9e..3cc797f12 100644 --- a/readme.txt +++ b/readme.txt @@ -65,6 +65,8 @@ in 2.0.1).
- FIX: Fixed broken AVR port (bug 3016619)(backported in 2.0.0).
- FIX: Fixed assertion in adcStop() (bug 3015109)(backported in 2.0.0).
+- NEW: Added timers clock macros to the STM32 clock tree HAL driver (backported
+ in 2.0.1).
- OPT: Simplified the test suite code, now it is smaller.
- Reorganized the documentation, now the description of the device drivers
implementation is under the HAL module instead of the Ports module.
|