From eb54fbf2852eebd8eb921a6c95574a585f62f871 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sat, 1 Oct 2016 16:13:45 +0000 Subject: [PATCH] adc: update to standardized calibrate api Drop leftover code from before they were blocking, unify all to standard api. --- examples/stm32/f0/stm32f0-discovery/adc/adc.c | 3 +-- examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c | 4 +--- .../stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c | 4 +--- .../f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c | 4 +--- .../adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c | 4 +--- examples/stm32/f1/lisa-m-2/adc_regular/adc.c | 2 +- examples/stm32/f1/other/adc_temperature_sensor/adc.c | 2 +- .../f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c | 2 +- 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/examples/stm32/f0/stm32f0-discovery/adc/adc.c b/examples/stm32/f0/stm32f0-discovery/adc/adc.c index cb9ea39..f0a46fe 100644 --- a/examples/stm32/f0/stm32f0-discovery/adc/adc.c +++ b/examples/stm32/f0/stm32f0-discovery/adc/adc.c @@ -38,8 +38,7 @@ static void adc_setup(void) adc_power_off(ADC1); adc_set_clk_source(ADC1, ADC_CLKSOURCE_ADC); - adc_calibrate_start(ADC1); - adc_calibrate_wait_finish(ADC1); + adc_calibrate(ADC1); adc_set_operation_mode(ADC1, ADC_MODE_SCAN); adc_disable_external_trigger_regular(ADC1); adc_set_right_aligned(ADC1); diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c index f69d7ac..7b550bd 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c +++ b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c @@ -89,9 +89,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); //added this check - adc_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c index e8a14a9..4928a07 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c @@ -109,9 +109,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); - adc_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c index 3dfc775..3cfefc7 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c @@ -122,9 +122,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); - adc_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c index 223d32b..93983ec 100644 --- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c +++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c @@ -139,9 +139,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); //added this check - adc_calibration(ADC1); - while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c index 88298be..309cebb 100644 --- a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c +++ b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c @@ -85,7 +85,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - adc_calibration(ADC1); + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c index 0159513..31552b8 100644 --- a/examples/stm32/f1/other/adc_temperature_sensor/adc.c +++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c @@ -82,7 +82,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - adc_calibration(ADC1); + adc_calibrate(ADC1); } static void my_usart_print_int(uint32_t usart, int value) diff --git a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c index 8d0c12c..c6f0e8e 100644 --- a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c +++ b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c @@ -112,7 +112,7 @@ static void adc_setup(void) __asm__("nop"); adc_reset_calibration(ADC1); - adc_calibration(ADC1); + adc_calibrate(ADC1); } static void dac_setup(void)