diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-12-30 15:06:20 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-12-30 15:06:20 +0000 |
| commit | 8c68f1fe7eb3e197f4c3ff04359db11f6124265a (patch) | |
| tree | 5693644a8468dd20f45a44ed30460f50cacc8998 /os/hal | |
| parent | da90520c9f1ca80168b54d437b0ad65cc0ddbb71 (diff) | |
| download | ChibiOS-8c68f1fe7eb3e197f4c3ff04359db11f6124265a.tar.gz ChibiOS-8c68f1fe7eb3e197f4c3ff04359db11f6124265a.tar.bz2 ChibiOS-8c68f1fe7eb3e197f4c3ff04359db11f6124265a.zip | |
Working now.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12498 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c index b45aef900..6762ec8e6 100644 --- a/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv4/hal_adc_lld.c @@ -153,16 +153,18 @@ static void adc_lld_calibrate(ADCDriver *adcp) { osalDbgAssert(adcp->adcm->CR == ADC_CR_ADVREGEN, "invalid register state");
- adcp->adcm->CR = adcp->config->calibration & (ADC_CR_ADCALDIF |
- ADC_CR_ADCALLIN);
+ adcp->adcm->CR &= ~(ADC_CR_ADCALDIF | ADC_CR_ADCALLIN);
+ adcp->adcm->CR |= adcp->config->calibration & (ADC_CR_ADCALDIF |
+ ADC_CR_ADCALLIN);
adcp->adcm->CR |= ADC_CR_ADCAL;
while ((adcp->adcm->CR & ADC_CR_ADCAL) != 0U)
;
#if STM32_ADC_DUAL_MODE
osalDbgAssert(adcp->adcs->CR == ADC_CR_ADVREGEN, "invalid register state");
- adcp->adcs->CR = adcp->config->calibration & (ADC_CR_ADCALDIF |
- ADC_CR_ADCALLIN);
+ adcp->adcs->CR &= ~(ADC_CR_ADCALDIF | ADC_CR_ADCALLIN);
+ adcp->adcs->CR |= adcp->config->calibration & (ADC_CR_ADCALDIF |
+ ADC_CR_ADCALLIN);
adcp->adcs->CR |= ADC_CR_ADCAL;
while ((adcp->adcs->CR & ADC_CR_ADCAL) != 0U)
;
|