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

#1117 #6. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13783 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-07-24 08:52:58 +00:00
parent 043250507f
commit 95b934e07c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
uint32_t dmamode, cfgr; uint32_t dmamode, cfgr;
const ADCConversionGroup *grpp = adcp->grpp; const ADCConversionGroup *grpp = adcp->grpp;
#if STM32_ADC_DUAL_MODE #if STM32_ADC_DUAL_MODE
uint32_t ccr = grpp->ccr & ~(ADC_CCR_CKMODE_MASK | ADC_CCR_DUAL_MASK); uint32_t ccr = grpp->ccr & ~(ADC_CCR_CKMODE_MASK | ADC_CCR_DAMDF_MASK);
#endif #endif
osalDbgAssert(!STM32_ADC_DUAL_MODE || ((grpp->num_channels & 1) == 0), osalDbgAssert(!STM32_ADC_DUAL_MODE || ((grpp->num_channels & 1) == 0),
@ -573,7 +573,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
in the conversion group configuration structure, static settings are in the conversion group configuration structure, static settings are
preserved.*/ preserved.*/
adcp->adcc->CCR = (adcp->adcc->CCR & adcp->adcc->CCR = (adcp->adcc->CCR &
(ADC_CCR_CKMODE_MASK | ADC_CCR_DUAL_MASK)) | ccr; (ADC_CCR_CKMODE_MASK | ADC_CCR_DAMDF_MASK)) | ccr;
adcp->adcm->CFGR2 = grpp->cfgr2; adcp->adcm->CFGR2 = grpp->cfgr2;
adcp->adcm->PCSEL = grpp->pcsel; adcp->adcm->PCSEL = grpp->pcsel;