diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-16 10:11:32 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-16 10:11:32 +0000 |
| commit | b685bbe51dde88c5a2654b378b156ae01e8da316 (patch) | |
| tree | 1df04b220684f43a3f1599caf35bc7ea24aee34f /os | |
| parent | 019ab0efbf17a86ffae7118658e47bc5b01495ed (diff) | |
| download | ChibiOS-b685bbe51dde88c5a2654b378b156ae01e8da316.tar.gz ChibiOS-b685bbe51dde88c5a2654b378b156ae01e8da316.tar.bz2 ChibiOS-b685bbe51dde88c5a2654b378b156ae01e8da316.zip | |
Fixed bug #822.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11294 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c index 7c4695522..93534b2e3 100644 --- a/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv2/hal_adc_lld.c @@ -384,7 +384,8 @@ void adc_lld_stop_conversion(ADCDriver *adcp) { dmaStreamDisable(adcp->dmastp);
adcp->adc->CR1 = 0;
- adcp->adc->CR2 = 0;
+ /* Because ticket #822, preserving injected conversions.*/
+ adcp->adc->CR2 &= ~(ADC_CR2_SWSTART);
adcp->adc->CR2 = ADC_CR2_ADON;
}
|