From 2092a6759dedf17dfa2808cf9ec2164078c330a3 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sun, 10 Apr 2016 13:41:54 +0000 Subject: [PATCH] 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: https://github.com/libopencm3/libopencm3-examples/pull/130 --- examples/stm32/f0/stm32f0-discovery/adc/adc.c | 2 +- examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c | 2 +- .../f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c | 2 +- .../adc_injec_timtrig_irq/adc_injec_timtrig_irq.c | 2 +- .../adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c | 2 +- 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 +- examples/stm32/f3/stm32f3-discovery/adc/adc.c | 8 ++++---- .../f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c | 2 +- .../stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c | 2 +- libopencm3 | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/stm32/f0/stm32f0-discovery/adc/adc.c b/examples/stm32/f0/stm32f0-discovery/adc/adc.c index 4249879..cb9ea39 100644 --- a/examples/stm32/f0/stm32f0-discovery/adc/adc.c +++ b/examples/stm32/f0/stm32f0-discovery/adc/adc.c @@ -26,7 +26,7 @@ #include #include -uint8_t channel_array[] = { ADC_CHANNEL1, ADC_CHANNEL1, ADC_CHANNEL_TEMP}; +uint8_t channel_array[] = { 1, 1, ADC_CHANNEL_TEMP}; static void adc_setup(void) { 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 7bdbeb0..f8a3114 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 @@ -67,7 +67,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single injected conversion. */ adc_disable_scan_mode(ADC1); 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 f3c5dd1..2176d8e 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 @@ -87,7 +87,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single timer triggered injected conversion. */ adc_disable_scan_mode(ADC1); 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 0ee3196..c738640 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 @@ -98,7 +98,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single timer triggered injected conversion with interrupt generation. */ /* While not needed for a single channel, try out scan mode which does all channels in one sweep and 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 16705e7..c74ac22 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 @@ -106,7 +106,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single timer triggered injected conversion with interrupt generation. */ /* While not needed for a single channel, try out scan mode which does all channels in one sweep and 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 324064b..f6c80ae 100644 --- a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c +++ b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c @@ -67,7 +67,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single conversion. */ adc_disable_scan_mode(ADC1); diff --git a/examples/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c index 6559dea..0f2a6b6 100644 --- a/examples/stm32/f1/other/adc_temperature_sensor/adc.c +++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c @@ -64,7 +64,7 @@ static void adc_setup(void) rcc_periph_clock_enable(RCC_ADC1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single conversion. */ adc_disable_scan_mode(ADC1); 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 639b9e0..8d0c12c 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 @@ -95,7 +95,7 @@ static void adc_setup(void) gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, GPIO1); /* Make sure the ADC doesn't run during config. */ - adc_off(ADC1); + adc_power_off(ADC1); /* We configure everything for one single conversion. */ adc_disable_scan_mode(ADC1); diff --git a/examples/stm32/f3/stm32f3-discovery/adc/adc.c b/examples/stm32/f3/stm32f3-discovery/adc/adc.c index a6c2f3a..f66d811 100644 --- a/examples/stm32/f3/stm32f3-discovery/adc/adc.c +++ b/examples/stm32/f3/stm32f3-discovery/adc/adc.c @@ -52,19 +52,19 @@ static void adc_setup(void) //ADC gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0); gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1); - adc_off(ADC1); - adc_set_clk_prescale(ADC_CCR_CKMODE_DIV2); + adc_power_off(ADC1); + adc_set_clk_prescale(ADC1, ADC_CCR_CKMODE_DIV2); adc_set_single_conversion_mode(ADC1); adc_disable_external_trigger_regular(ADC1); adc_set_right_aligned(ADC1); /* We want to read the temperature sensor, so we have to enable it. */ adc_enable_temperature_sensor(); - adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR1_SMP_61DOT5CYC); + adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR_SMP_61DOT5CYC); uint8_t channel_array[16]; channel_array[0]=16; // Vts (Internal temperature sensor channel_array[0]=1; //ADC1_IN1 (PA0) adc_set_regular_sequence(ADC1, 1, channel_array); - adc_set_resolution(ADC1, ADC_CFGR_RES_12_BIT); + adc_set_resolution(ADC1, ADC_CFGR1_RES_12_BIT); adc_power_on(ADC1); /* Wait for ADC starting up. */ diff --git a/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c index 369e3d4..c00dd48 100644 --- a/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c +++ b/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c @@ -98,7 +98,7 @@ static void adc_setup(void) gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0); gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1); - adc_off(ADC1); + adc_power_off(ADC1); adc_disable_scan_mode(ADC1); adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR_SMP_3CYC); diff --git a/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c index fed4f62..2c2b689 100644 --- a/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c +++ b/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c @@ -99,7 +99,7 @@ static void adc_setup(void) gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0); gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1); - adc_off(ADC1); + adc_power_off(ADC1); adc_disable_scan_mode(ADC1); adc_set_sample_time_on_all_channels(ADC1, ADC_SMPR_SMP_3CYC); diff --git a/libopencm3 b/libopencm3 index e8a4a37..28592a7 160000 --- a/libopencm3 +++ b/libopencm3 @@ -1 +1 @@ -Subproject commit e8a4a37b9c2f1f1cfad4d1f92b8151dac3f113c0 +Subproject commit 28592a7ca38cdea18028df1b58df38f30d9d14d2