rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2031 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2010-06-22 07:30:08 +00:00
parent 33c520eb8b
commit 8783391c5e
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/hal/platforms/STM32/hal_lld_f103.h
View File

@ -325,18 +325,21 @@
#endif #endif
/** /**
* @brief Timers clocks. * @brief Timers 2, 3, 4, 5, 6, 7, 12, 13, 14 clock.
*/ */
#if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__) #if (STM32_PPRE1 == STM32_PPRE1_DIV1) || defined(__DOXYGEN__)
#define STM32_TIMCLK1 (STM32_PCLK1 * 1) #define STM32_TIMCLK1 (STM32_PCLK1 * 1)
#else #else
#define STM32_TIMCLK1 (STM32_PCLK1 * 2) #define STM32_TIMCLK1 (STM32_PCLK1 * 2)
#endif #endif
/**
* @brief Timers 1, 8, 9, 10 and 11 clock.
*/
#if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__) #if (STM32_PPRE2 == STM32_PPRE2_DIV1) || defined(__DOXYGEN__)
#define STM32_TIMCLK2 (STM32_PCLK2 * 1) #define STM32_TIMCLK2 (STM32_PCLK2 * 1)
#else #else
#define STM32_TIMCLK2 (STM32_PCLK2 * 2) #define STM32_TIMCLK2 (STM32_PCLK2 * 2)
#endif #endif
/** /**

18
os/hal/platforms/STM32/hal_lld_f105_f107.h
View File

@ -426,6 +426,24 @@
#error "STM32_ADCCLK exceeding maximum frequency (14MHz)" #error "STM32_ADCCLK exceeding maximum frequency (14MHz)"
#endif #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. * @brief Flash settings.
*/ */

2
readme.txt
View File

@ -65,6 +65,8 @@
in 2.0.1). in 2.0.1).
- FIX: Fixed broken AVR port (bug 3016619)(backported in 2.0.0). - FIX: Fixed broken AVR port (bug 3016619)(backported in 2.0.0).
- FIX: Fixed assertion in adcStop() (bug 3015109)(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. - OPT: Simplified the test suite code, now it is smaller.
- Reorganized the documentation, now the description of the device drivers - Reorganized the documentation, now the description of the device drivers
implementation is under the HAL module instead of the Ports module. implementation is under the HAL module instead of the Ports module.