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 #903. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10977 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-11-08 14:49:52 +00:00
parent 84683817cd
commit 8f814aba60
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.c
View File

@ -395,7 +395,7 @@ void adcSTM32DisableTS(void) {
ADC->CCR &= ~ADC_CCR_TSEN; ADC->CCR &= ~ADC_CCR_TSEN;
} }
#ifdef STM32F0XX #if defined(ADC_CCR_VBATEN) || defined(__DOXYGEN__)
/** /**
* @brief Enables the VBATEN bit. * @brief Enables the VBATEN bit.
* @details The VBATEN bit is required in order to sample the VBAT channel. * @details The VBATEN bit is required in order to sample the VBAT channel.
@ -425,7 +425,7 @@ void adcSTM32DisableVBAT(void) {
ADC->CCR &= ~ADC_CCR_VBATEN; ADC->CCR &= ~ADC_CCR_VBATEN;
} }
#endif /* STM32F0XX */ #endif /* defined(ADC_CCR_VBATEN) */
#endif /* HAL_USE_ADC */ #endif /* HAL_USE_ADC */

4
os/hal/ports/STM32/LLD/ADCv1/hal_adc_lld.h
View File

@ -434,10 +434,10 @@ extern "C" {
void adcSTM32DisableVREF(void); void adcSTM32DisableVREF(void);
void adcSTM32EnableTS(void); void adcSTM32EnableTS(void);
void adcSTM32DisableTS(void); void adcSTM32DisableTS(void);
#ifdef STM32F0XX #if defined(ADC_CCR_VBATEN)
void adcSTM32EnableVBAT(void); void adcSTM32EnableVBAT(void);
void adcSTM32DisableVBAT(void); void adcSTM32DisableVBAT(void);
#endif /* STM32F0XX */ #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
readme.txt
View File

@ -152,6 +152,7 @@
dependencies and configuration directories. This makes possible dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project. to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode. Updated the various platform.mk implementing "smart build" mode.
- HAL: Fixed ADC does not build on STM32F030 (bug #903)(backported to 17.6.4).
- LIB: Fixed typo for function evtStop (bug #897)(backported to 17.6.4 - LIB: Fixed typo for function evtStop (bug #897)(backported to 17.6.4
and 16.1.10). and 16.1.10).
- NIL: Fixed core and Heap allocators not functional in NIL (bug #902) - NIL: Fixed core and Heap allocators not functional in NIL (bug #902)