git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11294 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2018-01-16 10:11:32 +00:00
parent 019ab0efbf
commit b685bbe51d
2 changed files with 3 additions and 1 deletions

View File

@ -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;
}

View File

@ -275,3 +275,4 @@
to 17.6.1).
- VAR: Fixed CMSIS_OS issue in timers (bug #846)(backported to 17.6.1
and 16.1.9).
- HAL: Fixed injected ADC with regular conversion (bug #822).