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

More ADCv5 fixes. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15740 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-08-28 13:31:15 +00:00
parent e0f250edcf
commit b374f18f71
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
os/hal/ports/STM32/LLD/ADCv5/hal_adc_lld.c
View File

@ -98,7 +98,7 @@ static void adc_lld_stop_adc(ADC_TypeDef *adc) {
/* Disabling the ADC.*/ /* Disabling the ADC.*/
adc->CR |= ADC_CR_ADDIS; adc->CR |= ADC_CR_ADDIS;
while ((adc->CR & ADC_CR_ADDIS) != 0U) { while ((adc->CR & ADC_CR_ADEN) != 0U) {
/* Waiting for ADC to be disabled.*/ /* Waiting for ADC to be disabled.*/
} }
} }
@ -238,26 +238,28 @@ void adc_lld_start(ADCDriver *adcp) {
*/ */
void adc_lld_stop(ADCDriver *adcp) { void adc_lld_stop(ADCDriver *adcp) {
/* If in ready state then disables the ADC clock and analog part.*/ /* If in ready state then disables the ADC peripheral and clock.*/
if (adcp->state == ADC_READY) { if (adcp->state == ADC_READY) {
dmaStreamFreeI(adcp->dmastp); dmaStreamFreeI(adcp->dmastp);
adcp->dmastp = NULL; adcp->dmastp = NULL;
/* Disabling the ADC.*/
adcp->adc->CR |= ADC_CR_ADDIS;
while ((adcp->adc->CR & ADC_CR_ADEN) != 0U) {
/* Waiting for ADC to be disabled.*/
}
/* Regulator off.*/ /* Regulator off.*/
#if defined(ADC_CR_ADVREGEN) #if defined(ADC_CR_ADVREGEN)
adcp->adc->CR &= ~ADC_CR_ADVREGEN; adcp->adc->CR &= ~ADC_CR_ADVREGEN;
#endif #endif
#if STM32_ADC_USE_ADC1
if (&ADCD1 == adcp)
rccDisableADC1();
#endif
}
/* Disabling the ADC.*/ #if STM32_ADC_USE_ADC1
adcp->adc->CR |= ADC_CR_ADDIS; if (&ADCD1 == adcp) {
while ((adcp->adc->CR & ADC_CR_ADDIS) != 0U) { rccDisableADC1();
/* Waiting for ADC to be disabled.*/ }
#endif
} }
} }
@ -269,6 +271,7 @@ void adc_lld_stop(ADCDriver *adcp) {
* @notapi * @notapi
*/ */
void adc_lld_start_conversion(ADCDriver *adcp) { void adc_lld_start_conversion(ADCDriver *adcp) {
uint32_t mode, cfgr1, cfgr2; uint32_t mode, cfgr1, cfgr2;
const ADCConversionGroup *grpp = adcp->grpp; const ADCConversionGroup *grpp = adcp->grpp;
@ -322,7 +325,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
/* Enable the ADC. Note: Setting ADEN must be deferred as a STM32G071 will /* Enable the ADC. Note: Setting ADEN must be deferred as a STM32G071 will
reset RES[1:0] resolution bits if CFGR1 is modified with ADEN set reset RES[1:0] resolution bits if CFGR1 is modified with ADEN set
(see STM32G071xx errata ES0418 Rev 3 2.6.2). Same applies to STM32WLE.*/ (see STM32G071xx errata ES0418 Rev 3 2.6.2). Same applies to STM32WL.*/
adcp->adc->CR |= ADC_CR_ADEN; adcp->adc->CR |= ADC_CR_ADEN;
while ((adcp->adc->ISR & ADC_ISR_ADRDY) == 0U) { while ((adcp->adc->ISR & ADC_ISR_ADRDY) == 0U) {
/* Wait for the ADC to become ready.*/ /* Wait for the ADC to become ready.*/