Skip to content

Commit 2092a67

Browse files
committed
update libopencm3
This brings in the new ADC api for STM32 parts. Update to new standardized ADC apis. Drops pointless channel definitions, uses common names for common functions. No functional changes. Based on work in: libopencm3/libopencm3-examples#130
1 parent b50cdb5 commit 2092a67

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

examples/stm32/f0/stm32f0-discovery/adc/adc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <libopencm3/stm32/usart.h>
2727
#include <libopencm3/stm32/gpio.h>
2828

29-
uint8_t channel_array[] = { ADC_CHANNEL1, ADC_CHANNEL1, ADC_CHANNEL_TEMP};
29+
uint8_t channel_array[] = { 1, 1, ADC_CHANNEL_TEMP};
3030

3131
static void adc_setup(void)
3232
{

examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void adc_setup(void)
6767
rcc_periph_clock_enable(RCC_ADC1);
6868

6969
/* Make sure the ADC doesn't run during config. */
70-
adc_off(ADC1);
70+
adc_power_off(ADC1);
7171

7272
/* We configure everything for one single injected conversion. */
7373
adc_disable_scan_mode(ADC1);

examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void adc_setup(void)
8787
rcc_periph_clock_enable(RCC_ADC1);
8888

8989
/* Make sure the ADC doesn't run during config. */
90-
adc_off(ADC1);
90+
adc_power_off(ADC1);
9191

9292
/* We configure everything for one single timer triggered injected conversion. */
9393
adc_disable_scan_mode(ADC1);

examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void adc_setup(void)
9898
rcc_periph_clock_enable(RCC_ADC1);
9999

100100
/* Make sure the ADC doesn't run during config. */
101-
adc_off(ADC1);
101+
adc_power_off(ADC1);
102102

103103
/* We configure everything for one single timer triggered injected conversion with interrupt generation. */
104104
/* While not needed for a single channel, try out scan mode which does all channels in one sweep and

examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static void adc_setup(void)
106106
rcc_periph_clock_enable(RCC_ADC1);
107107

108108
/* Make sure the ADC doesn't run during config. */
109-
adc_off(ADC1);
109+
adc_power_off(ADC1);
110110

111111
/* We configure everything for one single timer triggered injected conversion with interrupt generation. */
112112
/* While not needed for a single channel, try out scan mode which does all channels in one sweep and

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void adc_setup(void)
6767
rcc_periph_clock_enable(RCC_ADC1);
6868

6969
/* Make sure the ADC doesn't run during config. */
70-
adc_off(ADC1);
70+
adc_power_off(ADC1);
7171

7272
/* We configure everything for one single conversion. */
7373
adc_disable_scan_mode(ADC1);

examples/stm32/f1/other/adc_temperature_sensor/adc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static void adc_setup(void)
6464
rcc_periph_clock_enable(RCC_ADC1);
6565

6666
/* Make sure the ADC doesn't run during config. */
67-
adc_off(ADC1);
67+
adc_power_off(ADC1);
6868

6969
/* We configure everything for one single conversion. */
7070
adc_disable_scan_mode(ADC1);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static void adc_setup(void)
9595
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO1);
9696

9797
/* Make sure the ADC doesn't run during config. */
98-
adc_off(ADC1);
98+
adc_power_off(ADC1);
9999

100100
/* We configure everything for one single conversion. */
101101
adc_disable_scan_mode(ADC1);

examples/stm32/f3/stm32f3-discovery/adc/adc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ static void adc_setup(void)
5252
//ADC
5353
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0);
5454
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1);
55-
adc_off(ADC1);
56-
adc_set_clk_prescale(ADC_CCR_CKMODE_DIV2);
55+
adc_power_off(ADC1);
56+
adc_set_clk_prescale(ADC1, ADC_CCR_CKMODE_DIV2);
5757
adc_set_single_conversion_mode(ADC1);
5858
adc_disable_external_trigger_regular(ADC1);
5959
adc_set_right_aligned(ADC1);
6060
/* We want to read the temperature sensor, so we have to enable it. */
6161
adc_enable_temperature_sensor();
62-
adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR1_SMP_61DOT5CYC);
62+
adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR_SMP_61DOT5CYC);
6363
uint8_t channel_array[16];
6464
channel_array[0]=16; // Vts (Internal temperature sensor
6565
channel_array[0]=1; //ADC1_IN1 (PA0)
6666
adc_set_regular_sequence(ADC1, 1, channel_array);
67-
adc_set_resolution(ADC1, ADC_CFGR_RES_12_BIT);
67+
adc_set_resolution(ADC1, ADC_CFGR1_RES_12_BIT);
6868
adc_power_on(ADC1);
6969

7070
/* Wait for ADC starting up. */

examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void adc_setup(void)
9898
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0);
9999
gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1);
100100

101-
adc_off(ADC1);
101+
adc_power_off(ADC1);
102102
adc_disable_scan_mode(ADC1);
103103
adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR_SMP_3CYC);
104104

0 commit comments

Comments
 (0)