3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: Don't set boost nor linear calibration on stm32h723 adc3 

Only adc1 and adc2 have these CR register bits on stm32h723.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2022-12-14 11:36:18 -05:00
parent cefbad9ef4
commit 33f973e452
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/stm32/stm32h7_adc.c
View File

@ -210,20 +210,26 @@ gpio_adc_setup(uint32_t pin)
// Enable the ADC // Enable the ADC
if (!(adc->CR & ADC_CR_ADEN)) { if (!(adc->CR & ADC_CR_ADEN)) {
// Switch on voltage regulator and wait for it to stabilize // Switch on voltage regulator and wait for it to stabilize
adc->CR = ADC_CR_ADVREGEN; uint32_t cr = ADC_CR_ADVREGEN;
adc->CR = cr;
uint32_t end = timer_read_time() + timer_from_us(20); uint32_t end = timer_read_time() + timer_from_us(20);
while (timer_is_before(timer_read_time(), end)) while (timer_is_before(timer_read_time(), end))
; ;
// Perform adc calibration // Setup chip specific flags
uint32_t cr = ADC_CR_ADVREGEN | ADC_CR_ADCAL;
#if CONFIG_MACH_STM32H7 #if CONFIG_MACH_STM32H7
// Set boost mode on stm32h7 (adc clock is at 25Mhz) if (!(CONFIG_MACH_STM32H723 && adc == ADC3)) {
cr |= 0b10 << ADC_CR_BOOST_Pos; // Use linear calibration on stm32h7
// Use linear calibration on stm32h7 cr |= ADC_CR_ADCALLIN;
cr |= ADC_CR_ADCALLIN; // Set boost mode on stm32h7 (adc clock is at 25Mhz)
cr |= 0b10 << ADC_CR_BOOST_Pos;
// Set 12bit samples on the stm32h7
adc->CFGR = ADC_CFGR_JQDIS | (0b110 << ADC_CFGR_RES_Pos);
}
#endif #endif
adc->CR = cr;
// Perform adc calibration
adc->CR = cr | ADC_CR_ADCAL;
while (adc->CR & ADC_CR_ADCAL) while (adc->CR & ADC_CR_ADCAL)
; ;
@ -242,12 +248,6 @@ gpio_adc_setup(uint32_t pin)
| (aticks << 27)); | (aticks << 27));
adc->SMPR1 = av; adc->SMPR1 = av;
adc->SMPR2 = av; adc->SMPR2 = av;
// The stm32h7 chips need to be set to 12bit samples
#if CONFIG_MACH_STM32H7
if (!(CONFIG_MACH_STM32H723 && adc == ADC3))
adc->CFGR = ADC_CFGR_JQDIS | (0b110 << ADC_CFGR_RES_Pos);
#endif
} }
if (pin == ADC_TEMPERATURE_PIN) { if (pin == ADC_TEMPERATURE_PIN) {