EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adc: update to standardized calibrate api

Browse Source 
Drop leftover code from before they were blocking, unify all to standard
api.
This commit is contained in:
Karl Palsson
2016-10-01 16:13:45 +00:00
parent fc690fd6c4
commit eb54fbf285
8 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/stm32/f0/stm32f0-discovery/adc/adc.c
View File

@@ -38,8 +38,7 @@ static void adc_setup(void)
adc_power_off(ADC1); adc_power_off(ADC1);
adc_set_clk_source(ADC1, ADC_CLKSOURCE_ADC); adc_set_clk_source(ADC1, ADC_CLKSOURCE_ADC);
adc_calibrate_start(ADC1); adc_calibrate(ADC1);
adc_calibrate_wait_finish(ADC1);
adc_set_operation_mode(ADC1, ADC_MODE_SCAN); adc_set_operation_mode(ADC1, ADC_MODE_SCAN);
adc_disable_external_trigger_regular(ADC1); adc_disable_external_trigger_regular(ADC1);
adc_set_right_aligned(ADC1); adc_set_right_aligned(ADC1);

4
examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
View File

@@ -89,9 +89,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); //added this check adc_calibrate(ADC1);
adc_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

4
examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
View File

@@ -109,9 +109,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); adc_calibrate(ADC1);
adc_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0);
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

4
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
View File

@@ -122,9 +122,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); adc_calibrate(ADC1);
adc_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0);
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

4
examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
View File

@@ -139,9 +139,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_RSTCAL) != 0); //added this check adc_calibrate(ADC1);
adc_calibration(ADC1);
while ((ADC_CR2(ADC1) & ADC_CR2_CAL) != 0); //added this check
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

2
examples/stm32/f1/lisa-m-2/adc_regular/adc.c
View File

@@ -85,7 +85,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
adc_calibration(ADC1); adc_calibrate(ADC1);
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

2
examples/stm32/f1/other/adc_temperature_sensor/adc.c
View File

@@ -82,7 +82,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
adc_calibration(ADC1); adc_calibrate(ADC1);
} }
static void my_usart_print_int(uint32_t usart, int value) static void my_usart_print_int(uint32_t usart, int value)

2
examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
View File

@@ -112,7 +112,7 @@ static void adc_setup(void)
__asm__("nop"); __asm__("nop");
adc_reset_calibration(ADC1); adc_reset_calibration(ADC1);
adc_calibration(ADC1); adc_calibrate(ADC1);
} }
static void dac_setup(void) static void dac_setup(void)