zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Giovanni Di Sirio 2015-11-10 09:52:11 +00:00
parent 1ae8efe009
commit d80425b576
3 changed files with 144 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
demos/STM32/RT-STM32L476RG-NUCLEO/mcuconf.h
View File

@ -36,28 +36,6 @@
/* /*
* HAL driver system settings. * HAL driver system settings.
*/ */
#define STM32_NO_INIT FALSE
#define STM32_HSI_ENABLED TRUE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED FALSE
#define STM32_ADC_CLOCK_ENABLED TRUE
#define STM32_USB_CLOCK_ENABLED TRUE
#define STM32_MSIRANGE STM32_MSIRANGE_2M
#define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSI
#define STM32_PLLMUL_VALUE 6
#define STM32_PLLDIV_VALUE 3
#define STM32_HPRE STM32_HPRE_DIV1
#define STM32_PPRE1 STM32_PPRE1_DIV1
#define STM32_PPRE2 STM32_PPRE2_DIV1
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
#define STM32_MCOPRE STM32_MCOPRE_DIV1
#define STM32_RTCSEL STM32_RTCSEL_NOCLOCK
#define STM32_RTCPRE STM32_RTCPRE_DIV2
#define STM32_VOS STM32_VOS_1P8
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
/* /*
* SERIAL driver system settings. * SERIAL driver system settings.

6
os/hal/ports/STM32/STM32F7xx/hal_lld.h
View File

@ -293,19 +293,19 @@
#define STM32_PLLSAIDIVR_DIV4 (1 << 16) /**< LCD_CLK is R divided by 4. */ #define STM32_PLLSAIDIVR_DIV4 (1 << 16) /**< LCD_CLK is R divided by 4. */
#define STM32_PLLSAIDIVR_DIV8 (2 << 16) /**< LCD_CLK is R divided by 8. */ #define STM32_PLLSAIDIVR_DIV8 (2 << 16) /**< LCD_CLK is R divided by 8. */
#define STM32_PLLSAIDIVR_DIV16 (3 << 16) /**< LCD_CLK is R divided by 16.*/ #define STM32_PLLSAIDIVR_DIV16 (3 << 16) /**< LCD_CLK is R divided by 16.*/
#define STM32_PLLSAIDIVR_OFF 0xFFFFFFFF /**< LCD CLK is not required. */ #define STM32_PLLSAIDIVR_OFF 0xFFFFFFFFU /**< LCD CLK is not required. */
#define STM32_SAI1SEL_MASK (3 << 20) /**< SAI1SEL mask. */ #define STM32_SAI1SEL_MASK (3 << 20) /**< SAI1SEL mask. */
#define STM32_SAI1SEL_SAIPLL (0 << 20) /**< SAI1 source is SAIPLL. */ #define STM32_SAI1SEL_SAIPLL (0 << 20) /**< SAI1 source is SAIPLL. */
#define STM32_SAI1SEL_I2SPLL (1 << 20) /**< SAI1 source is I2SPLL. */ #define STM32_SAI1SEL_I2SPLL (1 << 20) /**< SAI1 source is I2SPLL. */
#define STM32_SAI1SEL_CKIN (2 << 20) /**< SAI1 source is I2S_CKIN. */ #define STM32_SAI1SEL_CKIN (2 << 20) /**< SAI1 source is I2S_CKIN. */
#define STM32_SAI1SEL_OFF 0xFFFFFFFF /**< SAI1 clock is not required.*/ #define STM32_SAI1SEL_OFF 0xFFFFFFFFU /**< SAI1 clock is not required.*/
#define STM32_SAI2SEL_MASK (3 << 22) /**< SAI2SEL mask. */ #define STM32_SAI2SEL_MASK (3 << 22) /**< SAI2SEL mask. */
#define STM32_SAI2SEL_SAIPLL (0 << 22) /**< SAI2 source is SAIPLL. */ #define STM32_SAI2SEL_SAIPLL (0 << 22) /**< SAI2 source is SAIPLL. */
#define STM32_SAI2SEL_I2SPLL (1 << 22) /**< SAI2 source is I2SPLL. */ #define STM32_SAI2SEL_I2SPLL (1 << 22) /**< SAI2 source is I2SPLL. */
#define STM32_SAI2SEL_CKIN (2 << 22) /**< SAI2 source is I2S_CKIN. */ #define STM32_SAI2SEL_CKIN (2 << 22) /**< SAI2 source is I2S_CKIN. */
#define STM32_SAI2SEL_OFF 0xFFFFFFFF /**< SAI2 clock is not required.*/ #define STM32_SAI2SEL_OFF 0xFFFFFFFFU /**< SAI2 clock is not required.*/
#define STM32_TIMPRE_MASK (1 << 24) /**< TIMPRE mask. */ #define STM32_TIMPRE_MASK (1 << 24) /**< TIMPRE mask. */
#define STM32_TIMPRE_PCLK (0 << 24) /**< TIM clocks from PCLKx. */ #define STM32_TIMPRE_PCLK (0 << 24) /**< TIM clocks from PCLKx. */

174
os/hal/ports/STM32/STM32L4xx/hal_lld.h
View File

@ -219,7 +219,7 @@
* @brief Disables the PWR/RCC initialization in the HAL. * @brief Disables the PWR/RCC initialization in the HAL.
*/ */
#if !defined(STM32_NO_INIT) || defined(__DOXYGEN__) #if !defined(STM32_NO_INIT) || defined(__DOXYGEN__)
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#endif #endif
/** /**
@ -229,63 +229,63 @@
* the maximum voltage. * the maximum voltage.
*/ */
#if !defined(STM32_VOS) || defined(__DOXYGEN__) #if !defined(STM32_VOS) || defined(__DOXYGEN__)
#define STM32_VOS STM32_VOS_1P8 #define STM32_VOS STM32_VOS_1P8
#endif #endif
/** /**
* @brief Enables or disables the programmable voltage detector. * @brief Enables or disables the programmable voltage detector.
*/ */
#if !defined(STM32_PVD_ENABLE) || defined(__DOXYGEN__) #if !defined(STM32_PVD_ENABLE) || defined(__DOXYGEN__)
#define STM32_PVD_ENABLE FALSE #define STM32_PVD_ENABLE FALSE
#endif #endif
/** /**
* @brief Sets voltage level for programmable voltage detector. * @brief Sets voltage level for programmable voltage detector.
*/ */
#if !defined(STM32_PLS) || defined(__DOXYGEN__) #if !defined(STM32_PLS) || defined(__DOXYGEN__)
#define STM32_PLS STM32_PLS_LEV0 #define STM32_PLS STM32_PLS_LEV0
#endif #endif
/** /**
* @brief Enables or disables the HSI clock source. * @brief Enables or disables the HSI clock source.
*/ */
#if !defined(STM32_HSI_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_HSI_ENABLED) || defined(__DOXYGEN__)
#define STM32_HSI_ENABLED TRUE #define STM32_HSI_ENABLED TRUE
#endif #endif
/** /**
* @brief Enables or disables the LSI clock source. * @brief Enables or disables the LSI clock source.
*/ */
#if !defined(STM32_LSI_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_LSI_ENABLED) || defined(__DOXYGEN__)
#define STM32_LSI_ENABLED TRUE #define STM32_LSI_ENABLED TRUE
#endif #endif
/** /**
* @brief Enables or disables the HSE clock source. * @brief Enables or disables the HSE clock source.
*/ */
#if !defined(STM32_HSE_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_HSE_ENABLED) || defined(__DOXYGEN__)
#define STM32_HSE_ENABLED FALSE #define STM32_HSE_ENABLED FALSE
#endif #endif
/** /**
* @brief Enables or disables the LSE clock source. * @brief Enables or disables the LSE clock source.
*/ */
#if !defined(STM32_LSE_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_LSE_ENABLED) || defined(__DOXYGEN__)
#define STM32_LSE_ENABLED FALSE #define STM32_LSE_ENABLED FALSE
#endif #endif
/** /**
* @brief ADC clock setting. * @brief ADC clock setting.
*/ */
#if !defined(STM32_ADC_CLOCK_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_ADC_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_ADC_CLOCK_ENABLED TRUE #define STM32_ADC_CLOCK_ENABLED TRUE
#endif #endif
/** /**
* @brief USB clock setting. * @brief USB clock setting.
*/ */
#if !defined(STM32_USB_CLOCK_ENABLED) || defined(__DOXYGEN__) #if !defined(STM32_USB_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_USB_CLOCK_ENABLED TRUE #define STM32_USB_CLOCK_ENABLED TRUE
#endif #endif
/** /**
@ -306,14 +306,14 @@
* @brief MSI frequency setting. * @brief MSI frequency setting.
*/ */
#if !defined(STM32_MSIRANGE) || defined(__DOXYGEN__) #if !defined(STM32_MSIRANGE) || defined(__DOXYGEN__)
#define STM32_MSIRANGE STM32_MSIRANGE_4M #define STM32_MSIRANGE STM32_MSIRANGE_4M
#endif #endif
/** /**
* @brief MSI frequency setting after standby. * @brief MSI frequency setting after standby.
*/ */
#if !defined(STM32_MSISRANGE) || defined(__DOXYGEN__) #if !defined(STM32_MSISRANGE) || defined(__DOXYGEN__)
#define STM32_MSISRANGE STM32_MSISRANGE_4M #define STM32_MSISRANGE STM32_MSISRANGE_4M
#endif #endif
/** /**
@ -324,7 +324,7 @@
* the internal 16MHz HSI clock. * the internal 16MHz HSI clock.
*/ */
#if !defined(STM32_SW) || defined(__DOXYGEN__) #if !defined(STM32_SW) || defined(__DOXYGEN__)
#define STM32_SW STM32_SW_PLL #define STM32_SW STM32_SW_PLL
#endif #endif
/** /**
@ -335,27 +335,57 @@
* the internal 16MHz HSI clock. * the internal 16MHz HSI clock.
*/ */
#if !defined(STM32_PLLSRC) || defined(__DOXYGEN__) #if !defined(STM32_PLLSRC) || defined(__DOXYGEN__)
#define STM32_PLLSRC STM32_PLLSRC_HSI16 #define STM32_PLLSRC STM32_PLLSRC_HSI16
#endif #endif
/** /**
* @brief PLL multiplier value. * @brief PLLM divider value.
* @note The allowed values are 3, 4, 6, 8, 12, 16, 32, 48. * @note The allowed values are 1..8.
* @note The default value is calculated for a 32MHz system clock from * @note The default value is calculated for a 80MHz system clock from
* the internal 16MHz HSI clock. * an external 8MHz HSE clock.
*/ */
#if !defined(STM32_PLLMUL_VALUE) || defined(__DOXYGEN__) #if !defined(STM32_PLLM_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLMUL_VALUE 6 #define STM32_PLLM_VALUE 4
#endif #endif
/** /**
* @brief PLL divider value. * @brief PLLN multiplier value.
* @note The allowed values are 2, 3, 4. * @note The allowed values are 8..86.
* @note The default value is calculated for a 32MHz system clock from * @note The default value is calculated for a 216MHz system clock from
* the internal 16MHz HSI clock. * an external 25MHz HSE clock.
*/ */
#if !defined(STM32_PLLDIV_VALUE) || defined(__DOXYGEN__) #if !defined(STM32_PLLN_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLDIV_VALUE 3 #define STM32_PLLN_VALUE 40
#endif
/**
* @brief PLLP divider value.
* @note The allowed values are 7, 17.
* @note The default value is calculated for a 216MHz system clock from
* an external 25MHz HSE clock.
*/
#if !defined(STM32_PLLP_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLP_VALUE 2
#endif
/**
* @brief PLLQ divider value.
* @note The allowed values are 2, 4, 6, 8.
* @note The default value is calculated for a 216MHz system clock from
* an external 25MHz HSE clock.
*/
#if !defined(STM32_PLLQ_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLQ_VALUE 9
#endif
/**
* @brief PLLR divider value.
* @note The allowed values are 2, 4, 6, 8.
* @note The default value is calculated for a 216MHz system clock from
* an external 25MHz HSE clock.
*/
#if !defined(STM32_PLLR_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLR_VALUE 9
#endif #endif
/** /**
@ -364,49 +394,127 @@
* the internal 16MHz HSI clock. * the internal 16MHz HSI clock.
*/ */
#if !defined(STM32_HPRE) || defined(__DOXYGEN__) #if !defined(STM32_HPRE) || defined(__DOXYGEN__)
#define STM32_HPRE STM32_HPRE_DIV1 #define STM32_HPRE STM32_HPRE_DIV1
#endif #endif
/** /**
* @brief APB1 prescaler value. * @brief APB1 prescaler value.
*/ */
#if !defined(STM32_PPRE1) || defined(__DOXYGEN__) #if !defined(STM32_PPRE1) || defined(__DOXYGEN__)
#define STM32_PPRE1 STM32_PPRE1_DIV1 #define STM32_PPRE1 STM32_PPRE1_DIV1
#endif #endif
/** /**
* @brief APB2 prescaler value. * @brief APB2 prescaler value.
*/ */
#if !defined(STM32_PPRE2) || defined(__DOXYGEN__) #if !defined(STM32_PPRE2) || defined(__DOXYGEN__)
#define STM32_PPRE2 STM32_PPRE2_DIV1 #define STM32_PPRE2 STM32_PPRE2_DIV1
#endif #endif
/** /**
* @brief STOPWUCK clock setting. * @brief STOPWUCK clock setting.
*/ */
#if !defined(STM32_STOPWUCK) || defined(__DOXYGEN__) #if !defined(STM32_STOPWUCK) || defined(__DOXYGEN__)
#define STM32_STOPWUCK STM32_STOPWUCK_MSI #define STM32_STOPWUCK STM32_STOPWUCK_MSI
#endif #endif
/** /**
* @brief MCO clock source. * @brief MCO clock source.
*/ */
#if !defined(STM32_MCOSEL) || defined(__DOXYGEN__) #if !defined(STM32_MCOSEL) || defined(__DOXYGEN__)
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK #define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
#endif #endif
/** /**
* @brief MCO divider setting. * @brief MCO divider setting.
*/ */
#if !defined(STM32_MCOPRE) || defined(__DOXYGEN__) #if !defined(STM32_MCOPRE) || defined(__DOXYGEN__)
#define STM32_MCOPRE STM32_MCOPRE_DIV1 #define STM32_MCOPRE STM32_MCOPRE_DIV1
#endif
/**
* @brief PLLSAI1N multiplier value.
* @note The allowed values are 8..86.
*/
#if !defined(STM32_PLLSAI1N_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI1N_VALUE 40
#endif
/**
* @brief PLLSAI1P divider value.
* @note The allowed values are 7, 17.
*/
#if !defined(STM32_PLLSAI1P_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI1P_VALUE 7
#endif
/**
* @brief PLLSAI1Q divider value.
* @note The allowed values are 2, 4, 6, 8.
*/
#if !defined(STM32_PLLSAI1Q_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI1Q_VALUE 4
#endif
/**
* @brief PLLSAI1R divider value.
* @note The allowed values are 2, 4, 6, 8.
*/
#if !defined(STM32_PLLSAI1R_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI1R_VALUE 4
#endif
/**
* @brief PLLSAI2N multiplier value.
* @note The allowed values are 8..86.
*/
#if !defined(STM32_PLLSAI2N_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI2N_VALUE 40
#endif
/**
* @brief PLLSAI2P divider value.
* @note The allowed values are 7, 17.
*/
#if !defined(STM32_PLLSAI2P_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI2P_VALUE 7
#endif
/**
* @brief PLLSAI2Q divider value.
* @note The allowed values are 2, 4, 6, 8.
*/
#if !defined(STM32_PLLSAI2Q_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI2Q_VALUE 4
#endif
/**
* @brief PLLSAI2R divider value.
* @note The allowed values are 2, 4, 6, 8.
*/
#if !defined(STM32_PLLSAI2R_VALUE) || defined(__DOXYGEN__)
#define STM32_PLLSAI2R_VALUE 4
#endif #endif
/** /**
* @brief RTC/LCD clock source. * @brief RTC/LCD clock source.
*/ */
#if !defined(STM32_RTCSEL) || defined(__DOXYGEN__) #if !defined(STM32_RTCSEL) || defined(__DOXYGEN__)
#define STM32_RTCSEL STM32_RTCSEL_LSE #define STM32_RTCSEL STM32_RTCSEL_LSE
#endif
/**
* @brief SAI1SEL value (SAI1 clock source).
*/
#if !defined(STM32_SAI1SEL) || defined(__DOXYGEN__)
#define STM32_SAI1SEL STM32_SAI1SEL_OFF
#endif
/**
* @brief SAI2SEL value (SAI2 clock source).
*/
#if !defined(STM32_SAI2SEL) || defined(__DOXYGEN__)
#define STM32_SAI2SEL STM32_SAI2SEL_OFF
#endif #endif
/** @} */ /** @} */