Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stm32: Reset adc calibration prior to starting calibration 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-01-25 11:23:58 -05:00
parent bf3fa979f9
commit 502e83725b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/stm32/adc.c
View File

@ -39,6 +39,22 @@ static const uint8_t adc_pins[] = {
// stm32f407: ADC clock=21Mhz, Tconv=12, Tsamp=84, total=4.571us // stm32f407: ADC clock=21Mhz, Tconv=12, Tsamp=84, total=4.571us
// stm32f446: ADC clock=22.5Mhz, Tconv=12, Tsamp=84, total=4.267us // stm32f446: ADC clock=22.5Mhz, Tconv=12, Tsamp=84, total=4.267us
// Perform calibration on stm32f103
static void
adc_calibrate(ADC_TypeDef *adc)
{
#if CONFIG_MACH_STM32F1
adc->CR2 = ADC_CR2_ADON;
udelay(10);
adc->CR2 = ADC_CR2_ADON | ADC_CR2_RSTCAL;
while (adc->CR2 & ADC_CR2_RSTCAL)
;
adc->CR2 = ADC_CR2_ADON | ADC_CR2_CAL;
while (adc->CR2 & ADC_CR2_CAL)
;
#endif
}
struct gpio_adc struct gpio_adc
gpio_adc_setup(uint32_t pin) gpio_adc_setup(uint32_t pin)
{ {
@ -66,6 +82,7 @@ gpio_adc_setup(uint32_t pin)
// Enable the ADC // Enable the ADC
if (!is_enabled_pclock(adc_base)) { if (!is_enabled_pclock(adc_base)) {
enable_pclock(adc_base); enable_pclock(adc_base);
adc_calibrate(adc);
uint32_t aticks = 4; // 4-6us sample time (depending on stm32 chip) uint32_t aticks = 4; // 4-6us sample time (depending on stm32 chip)
adc->SMPR1 = (aticks | (aticks << 3) | (aticks << 6) | (aticks << 9) adc->SMPR1 = (aticks | (aticks << 3) | (aticks << 6) | (aticks << 9)
| (aticks << 12) | (aticks << 15) | (aticks << 18) | (aticks << 12) | (aticks << 15) | (aticks << 18)
@ -75,14 +92,6 @@ gpio_adc_setup(uint32_t pin)
| (aticks << 12) | (aticks << 15) | (aticks << 18) | (aticks << 12) | (aticks << 15) | (aticks << 18)
| (aticks << 21) | (aticks << 24) | (aticks << 27)); | (aticks << 21) | (aticks << 24) | (aticks << 27));
adc->CR2 = CR2_FLAGS; adc->CR2 = CR2_FLAGS;
#if CONFIG_MACH_STM32F1
// Perform calibration
udelay(10);
adc->CR2 = ADC_CR2_CAL | CR2_FLAGS;
while (adc->CR2 & ADC_CR2_CAL)
;
#endif
} }
gpio_peripheral(pin, GPIO_ANALOG, 0); gpio_peripheral(pin, GPIO_ANALOG, 0);