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

Fixed bug #979. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12283 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
Giovanni Di Sirio 2018-09-23 05:30:50 +00:00
parent f970eaeca2
commit 8ea6be2109
4 changed files with 3 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h
View File

@ -608,7 +608,7 @@
#if defined(STM32L4XX) || defined(STM32L4XXP) #if defined(STM32L4XX) || defined(STM32L4XXP)
#if STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK #if STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_ADCCK
#define STM32_ADC123_CLOCK STM32_ADC12CLK #define STM32_ADC123_CLOCK STM32_ADCCLK
#elif STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV1 #elif STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV1
#define STM32_ADC123_CLOCK (STM32_HCLK / 1) #define STM32_ADC123_CLOCK (STM32_HCLK / 1)
#elif STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV2 #elif STM32_ADC_ADC123_CLOCK_MODE == ADC_CCR_CKMODE_AHB_DIV2

28
os/hal/ports/STM32/STM32L4xx+/hal_lld.h
View File

@ -430,34 +430,6 @@
#define STM32_MSIPLL_ENABLED FALSE #define STM32_MSIPLL_ENABLED FALSE
#endif #endif
/**
* @brief ADC clock setting.
*/
#if !defined(STM32_ADC_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_ADC_CLOCK_ENABLED TRUE
#endif
/**
* @brief USB clock setting.
*/
#if !defined(STM32_USB_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_USB_CLOCK_ENABLED TRUE
#endif
/**
* @brief SAI1 clock setting.
*/
#if !defined(STM32_SAI1_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_SAI1_CLOCK_ENABLED TRUE
#endif
/**
* @brief SAI2 clock setting.
*/
#if !defined(STM32_SAI2_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_SAI2_CLOCK_ENABLED TRUE
#endif
/** /**
* @brief MSI frequency setting. * @brief MSI frequency setting.
*/ */

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

@ -403,34 +403,6 @@
#define STM32_MSIPLL_ENABLED FALSE #define STM32_MSIPLL_ENABLED FALSE
#endif #endif
/**
* @brief ADC clock setting.
*/
#if !defined(STM32_ADC_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_ADC_CLOCK_ENABLED TRUE
#endif
/**
* @brief USB clock setting.
*/
#if !defined(STM32_USB_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_USB_CLOCK_ENABLED TRUE
#endif
/**
* @brief SAI1 clock setting.
*/
#if !defined(STM32_SAI1_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_SAI1_CLOCK_ENABLED TRUE
#endif
/**
* @brief SAI2 clock setting.
*/
#if !defined(STM32_SAI2_CLOCK_ENABLED) || defined(__DOXYGEN__)
#define STM32_SAI2_CLOCK_ENABLED TRUE
#endif
/** /**
* @brief MSI frequency setting. * @brief MSI frequency setting.
*/ */

2
readme.txt
View File

@ -151,6 +151,8 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1). - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1). - EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1). - EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
- HAL: Fixed invalid STM32 ADCv3 clock selection for L4 and L4+ (bug #979)
(backported to 18.2.2 and 17.6.5).
- HAL: Fixed wrong number of endpoints fot STM32F412/413 (bug #978) - HAL: Fixed wrong number of endpoints fot STM32F412/413 (bug #978)
(backported to 18.2.2 and 17.6.5). (backported to 18.2.2 and 17.6.5).
- RT: Fixed chEvtGetAndClearFlags(...) does not mask events (bug #977) - RT: Fixed chEvtGetAndClearFlags(...) does not mask events (bug #977)