aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Dwyer2012-10-05 11:40:21 -0600
committerStephen Dwyer2012-10-07 15:38:02 -0600
commitbece4c30d3b953cd7f469d9db06559ca443df189 (patch)
treed563191ea7f3a44278c8089589204b4524959f6c
parent9e77f8c361407c61f2a72b98a5d1c50e72bf4a54 (diff)
added different ADC sampling examples for the LisaM v2 including:
* simple polling of an injected channel * timer triggered sampling of an injected channel * timer triggered sampling and IRQ handling of an injected channel * timer triggered sampling and IRQ handling of 4 injected channels
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec/Makefile27
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec/README11
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c174
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile27
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig/README11
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c195
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile27
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/README12
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c211
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile27
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/README12
-rw-r--r--examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c230
12 files changed, 964 insertions, 0 deletions
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec/Makefile
new file mode 100644
index 0000000..20355ce
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec/Makefile
@@ -0,0 +1,27 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This library is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library. If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = adc
+# Comment the following line if you _don't_ have luftboot flashed!
+LDFLAGS += -Wl,-Ttext=0x8002000
+CFLAGS += -std=c99
+LDSCRIPT = ../lisa-m.ld
+
+include ../../Makefile.include
+
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/README b/examples/stm32/f1/lisa-m-2/adc_injec/README
new file mode 100644
index 0000000..f0c7d62
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec/README
@@ -0,0 +1,11 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This is a simple polling example that sends the value read out from the
+temperature sensor ADC channel of the STM32 to the USART2.
+
+This example polls injected channels.
+
+The terminal settings for the receiving device/PC are 115200 8n1.
+
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
new file mode 100644
index 0000000..cba90f6
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
@@ -0,0 +1,174 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ * Copyright (C) 2012 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2012 Stephen Dwyer <dwyer.sc@gmail.com>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/adc.h>
+#include <libopencm3/stm32/usart.h>
+
+void usart_setup(void)
+{
+ /* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+
+ /* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
+ GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
+
+ /* Setup UART parameters. */
+ usart_set_baudrate(USART2, 115200);
+ usart_set_databits(USART2, 8);
+ usart_set_stopbits(USART2, USART_STOPBITS_1);
+ usart_set_mode(USART2, USART_MODE_TX_RX);
+ usart_set_parity(USART2, USART_PARITY_NONE);
+ usart_set_flow_control(USART2, USART_FLOWCONTROL_NONE);
+
+ /* Finally enable the USART. */
+ usart_enable(USART2);
+}
+
+void gpio_setup(void)
+{
+ /* Enable GPIO clocks. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+ /* Setup the LEDs. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO8);
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
+}
+
+void adc_setup(void)
+{
+ int i;
+
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+
+ /* Make sure the ADC doesn't run during config. */
+ adc_off(ADC1);
+
+ /* We configure everything for one single injected conversion. */
+ adc_disable_scan_mode(ADC1);
+ adc_set_single_conversion_mode(ADC1);
+ /* We can only use discontinuous mode on either the regular OR injected channels, not both */
+ adc_disable_discontinous_mode_regular(ADC1);
+ adc_enable_discontinous_mode_injected(ADC1);
+ /* We want to start the injected conversion in software */
+ adc_enable_external_trigger_injected(ADC1,ADC_CR2_JEXTSEL_JSWSTART);
+ adc_set_right_aligned(ADC1);
+ /* We want to read the temperature sensor, so we have to enable it. */
+ adc_enable_temperature_sensor(ADC1);
+ adc_set_conversion_time_on_all_channels(ADC1, ADC_SMPR_SMP_28DOT5CYC);
+
+ adc_on(ADC1);
+
+ /* Wait for ADC starting up. */
+ for (i = 0; i < 800000; i++) /* Wait a bit. */
+ __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
+}
+
+void my_usart_print_int(u32 usart, int value)
+{
+ s8 i;
+ u8 nr_digits = 0;
+ char buffer[25];
+
+ if (value < 0) {
+ usart_send_blocking(usart, '-');
+ value = value * -1;
+ }
+
+ while (value > 0) {
+ buffer[nr_digits++] = "0123456789"[value % 10];
+ value /= 10;
+ }
+
+ for (i = (nr_digits - 1); i >= 0; i--) {
+ usart_send_blocking(usart, buffer[i]);
+ }
+
+ usart_send_blocking(usart, '\r');
+}
+
+int main(void)
+{
+ u8 channel_array[16];
+ u16 temperature = 0;
+
+ rcc_clock_setup_in_hse_12mhz_out_72mhz();
+ gpio_setup();
+ usart_setup();
+ adc_setup();
+
+ gpio_set(GPIOA, GPIO8); /* LED1 on */
+ gpio_set(GPIOC, GPIO15); /* LED2 on */
+
+ /* Send a message on USART1. */
+ usart_send_blocking(USART2, 's');
+ usart_send_blocking(USART2, 't');
+ usart_send_blocking(USART2, 'm');
+ usart_send_blocking(USART2, '\r');
+ usart_send_blocking(USART2, '\n');
+
+ /* Select the channel we want to convert. 16=temperature_sensor. */
+ channel_array[0] = 16;
+ /* Set the injected sequence here, with number of channels */
+ adc_set_injected_sequence(ADC1, 1, channel_array);
+
+ /* Continously convert and poll the temperature ADC. */
+ while (1) {
+ /*
+ * If the ADC_CR2_ON bit is already set -> setting it another time
+ * starts a regular conversion. Injected conversion is started
+ * explicitly with the JSWSTART bit as an external trigger. It may
+ * also work by setting no regular channels and setting JAUTO to
+ * automatically convert the injected channels after the regular
+ * channels (of which there would be none). (Not tested.)
+ */
+ adc_start_conversion_injected(ADC1);
+
+ /* Wait for end of conversion. */
+ while (!(ADC_SR(ADC1) & ADC_SR_JEOC));
+ ADC_SR(ADC2) &= ~ADC_SR_JEOC; //clear injected end of conversion
+
+ temperature = ADC_JDR1(ADC1); //get the result from ADC_JDR1 on ADC1 (only bottom 16bits)
+
+ /*
+ * That's actually not the real temperature - you have to compute it
+ * as described in the datasheet.
+ */
+ my_usart_print_int(USART2, temperature);
+
+ gpio_toggle(GPIOA, GPIO8); /* LED2 on */
+
+ }
+
+ return 0;
+}
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile
new file mode 100644
index 0000000..20355ce
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/Makefile
@@ -0,0 +1,27 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This library is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library. If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = adc
+# Comment the following line if you _don't_ have luftboot flashed!
+LDFLAGS += -Wl,-Ttext=0x8002000
+CFLAGS += -std=c99
+LDSCRIPT = ../lisa-m.ld
+
+include ../../Makefile.include
+
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/README b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/README
new file mode 100644
index 0000000..d690f8a
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/README
@@ -0,0 +1,11 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This is a simple example that sends the value read out from the
+temperature sensor ADC channel of the STM32 to the USART2.
+
+This example uses a timer trigger to automatically sample the adc channel.
+
+The terminal settings for the receiving device/PC are 115200 8n1.
+
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
new file mode 100644
index 0000000..cb9f15d
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
@@ -0,0 +1,195 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ * Copyright (C) 2012 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2012 Stephen Dwyer <dwyer.sc@gmail.com>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/adc.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/timer.h>
+
+void usart_setup(void)
+{
+ /* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+
+ /* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
+ GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
+
+ /* Setup UART parameters. */
+ usart_set_baudrate(USART2, 115200);
+ usart_set_databits(USART2, 8);
+ usart_set_stopbits(USART2, USART_STOPBITS_1);
+ usart_set_mode(USART2, USART_MODE_TX_RX);
+ usart_set_parity(USART2, USART_PARITY_NONE);
+ usart_set_flow_control(USART2, USART_FLOWCONTROL_NONE);
+
+ /* Finally enable the USART. */
+ usart_enable(USART2);
+}
+
+void gpio_setup(void)
+{
+ /* Enable GPIO clocks. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+ /* Setup the LEDs. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO8);
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
+}
+
+void timer_setup(void)
+{
+ /* Set up the timer TIM2 for injected sampling */
+ uint32_t timer;
+ volatile uint32_t *rcc_apbenr;
+ uint32_t rcc_apb;
+
+ timer = TIM2;
+ rcc_apbenr = &RCC_APB1ENR;
+ rcc_apb = RCC_APB1ENR_TIM2EN;
+
+ rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+
+ /* Time Base configuration */
+ timer_reset(timer);
+ timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
+ TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
+ timer_set_period(timer, 0xFF);
+ timer_set_prescaler(timer, 0x8);
+ timer_set_clock_division(timer, 0x0);
+ /* Generate TRGO on every update. */
+ timer_set_master_mode(timer, TIM_CR2_MMS_UPDATE);
+ timer_enable_counter(timer);
+}
+
+void adc_setup(void)
+{
+ int i;
+
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+
+ /* Make sure the ADC doesn't run during config. */
+ adc_off(ADC1);
+
+ /* We configure everything for one single timer triggered injected conversion. */
+ adc_disable_scan_mode(ADC1);
+ adc_set_single_conversion_mode(ADC1);
+ /* We can only use discontinuous mode on either the regular OR injected channels, not both */
+ adc_disable_discontinous_mode_regular(ADC1);
+ adc_enable_discontinous_mode_injected(ADC1);
+ /* We want to start the injected conversion with the TIM2 TRGO */
+ adc_enable_external_trigger_injected(ADC1,ADC_CR2_JEXTSEL_TIM2_TRGO);
+ adc_set_right_aligned(ADC1);
+ /* We want to read the temperature sensor, so we have to enable it. */
+ adc_enable_temperature_sensor(ADC1);
+ adc_set_conversion_time_on_all_channels(ADC1, ADC_SMPR_SMP_28DOT5CYC);
+
+ adc_on(ADC1);
+
+ /* Wait for ADC starting up. */
+ for (i = 0; i < 800000; i++) /* Wait a bit. */
+ __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);
+}
+
+void my_usart_print_int(u32 usart, int value)
+{
+ s8 i;
+ u8 nr_digits = 0;
+ char buffer[25];
+
+ if (value < 0) {
+ usart_send_blocking(usart, '-');
+ value = value * -1;
+ }
+
+ while (value > 0) {
+ buffer[nr_digits++] = "0123456789"[value % 10];
+ value /= 10;
+ }
+
+ for (i = (nr_digits - 1); i >= 0; i--) {
+ usart_send_blocking(usart, buffer[i]);
+ }
+
+ usart_send_blocking(usart, '\r');
+}
+
+int main(void)
+{
+ u8 channel_array[16];
+ u16 temperature = 0;
+
+ rcc_clock_setup_in_hse_12mhz_out_72mhz();
+ gpio_setup();
+ usart_setup();
+ timer_setup();
+ adc_setup();
+
+ gpio_set(GPIOA, GPIO8); /* LED1 on */
+ gpio_set(GPIOC, GPIO15); /* LED2 on */
+
+ /* Send a message on USART1. */
+ usart_send_blocking(USART2, 's');
+ usart_send_blocking(USART2, 't');
+ usart_send_blocking(USART2, 'm');
+ usart_send_blocking(USART2, '\r');
+ usart_send_blocking(USART2, '\n');
+
+ /* Select the channel we want to convert. 16=temperature_sensor. */
+ channel_array[0] = 16;
+ /* Set the injected sequence here, with number of channels */
+ adc_set_injected_sequence(ADC1, 1, channel_array);
+
+ /* Continously convert and poll the temperature ADC. */
+ while (1) {
+ /*
+ * Since the injected sampling is triggered by the timer, it gets
+ * updated automatically, we just need to periodically read out the value.
+ * It would be better to check if the JEOC bit is set, and clear it following
+ * so that you do not read the same value twice, especially for a slower
+ * sampling rate.
+ */
+
+ temperature = ADC_JDR1(ADC1); //get the result from ADC_JDR1 on ADC1 (only bottom 16bits)
+
+ /*
+ * That's actually not the real temperature - you have to compute it
+ * as described in the datasheet.
+ */
+ my_usart_print_int(USART2, temperature);
+
+ gpio_toggle(GPIOA, GPIO8); /* LED2 on */
+
+ }
+
+ return 0;
+}
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile
new file mode 100644
index 0000000..20355ce
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/Makefile
@@ -0,0 +1,27 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This library is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library. If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = adc
+# Comment the following line if you _don't_ have luftboot flashed!
+LDFLAGS += -Wl,-Ttext=0x8002000
+CFLAGS += -std=c99
+LDSCRIPT = ../lisa-m.ld
+
+include ../../Makefile.include
+
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/README b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/README
new file mode 100644
index 0000000..175edce
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/README
@@ -0,0 +1,12 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This is a simple example that sends the value read out from the
+temperature sensor ADC channel of the STM32 to the USART2.
+
+This example uses a timer trigger to sample an injected adc channel and
+then uses an interrupt routine to retrieve the sample from the data register.
+
+The terminal settings for the receiving device/PC are 115200 8n1.
+
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
new file mode 100644
index 0000000..73814d8
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
@@ -0,0 +1,211 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ * Copyright (C) 2012 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2012 Stephen Dwyer <dwyer.sc@gmail.com>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/adc.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
+
+volatile u16 temperature = 0;
+
+void usart_setup(void)
+{
+ /* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+
+ /* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
+ GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
+
+ /* Setup UART parameters. */
+ usart_set_baudrate(USART2, 115200);
+ usart_set_databits(USART2, 8);
+ usart_set_stopbits(USART2, USART_STOPBITS_1);
+ usart_set_mode(USART2, USART_MODE_TX_RX);
+ usart_set_parity(USART2, USART_PARITY_NONE);
+ usart_set_flow_control(USART2, USART_FLOWCONTROL_NONE);
+
+ /* Finally enable the USART. */
+ usart_enable(USART2);
+}
+
+void gpio_setup(void)
+{
+ /* Enable GPIO clocks. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+ /* Setup the LEDs. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO8);
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
+}
+
+void timer_setup(void)
+{
+ /* Set up the timer TIM2 for injected sampling */
+ uint32_t timer;
+ volatile uint32_t *rcc_apbenr;
+ uint32_t rcc_apb;
+
+ timer = TIM2;
+ rcc_apbenr = &RCC_APB1ENR;
+ rcc_apb = RCC_APB1ENR_TIM2EN;
+
+ rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+
+ /* Time Base configuration */
+ timer_reset(timer);
+ timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
+ TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
+ timer_set_period(timer, 0xFF);
+ timer_set_prescaler(timer, 0x8);
+ timer_set_clock_division(timer, 0x0);
+ /* Generate TRGO on every update. */
+ timer_set_master_mode(timer, TIM_CR2_MMS_UPDATE);
+ timer_enable_counter(timer);
+}
+
+void irq_setup(void)
+{
+ /* Enable the adc1_2_isr() routine */
+ nvic_set_priority(NVIC_ADC1_2_IRQ, 0);
+ nvic_enable_irq(NVIC_ADC1_2_IRQ);
+}
+
+void adc_setup(void)
+{
+ int i;
+
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+
+ /* Make sure the ADC doesn't run during config. */
+ adc_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
+ * generates the interrupt/EOC/JEOC flags set at the end of all channels, not each one.
+ */
+ adc_enable_scan_mode(ADC1);
+ adc_set_single_conversion_mode(ADC1);
+ /* We want to start the injected conversion with the TIM2 TRGO */
+ adc_enable_external_trigger_injected(ADC1,ADC_CR2_JEXTSEL_TIM2_TRGO);
+ /* Generate the ADC1_2_IRQ */
+ adc_enable_jeoc_interrupt(ADC1);
+ adc_set_right_aligned(ADC1);
+ /* We want to read the temperature sensor, so we have to enable it. */
+ adc_enable_temperature_sensor(ADC1);
+ adc_set_conversion_time_on_all_channels(ADC1, ADC_SMPR_SMP_28DOT5CYC);
+
+ adc_on(ADC1);
+
+ /* Wait for ADC starting up. */
+ for (i = 0; i < 800000; i++) /* Wait a bit. */
+ __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);
+}
+
+void my_usart_print_int(u32 usart, int value)
+{
+ s8 i;
+ u8 nr_digits = 0;
+ char buffer[25];
+
+ if (value < 0) {
+ usart_send_blocking(usart, '-');
+ value = value * -1;
+ }
+
+ while (value > 0) {
+ buffer[nr_digits++] = "0123456789"[value % 10];
+ value /= 10;
+ }
+
+ for (i = (nr_digits - 1); i >= 0; i--) {
+ usart_send_blocking(usart, buffer[i]);
+ }
+
+ usart_send_blocking(usart, '\r');
+}
+
+int main(void)
+{
+ u8 channel_array[16];
+
+ rcc_clock_setup_in_hse_12mhz_out_72mhz();
+ gpio_setup();
+ usart_setup();
+ timer_setup();
+ irq_setup();
+ adc_setup();
+
+ gpio_set(GPIOA, GPIO8); /* LED1 on */
+ gpio_set(GPIOC, GPIO15); /* LED2 on */
+
+ /* Send a message on USART1. */
+ usart_send_blocking(USART2, 's');
+ usart_send_blocking(USART2, 't');
+ usart_send_blocking(USART2, 'm');
+ usart_send_blocking(USART2, '\r');
+ usart_send_blocking(USART2, '\n');
+
+ /* Select the channel we want to convert. 16=temperature_sensor. */
+ channel_array[0] = 16;
+ /* Set the injected sequence here, with number of channels */
+ adc_set_injected_sequence(ADC1, 1, channel_array);
+
+ /* Continously convert and poll the temperature ADC. */
+ while (1) {
+ /*
+ * Since sampling is triggered by the timer and copying the value
+ * out of the data register is handled by the interrupt routine,
+ * we just need to print the value and toggle the LED. It may be useful
+ * to buffer the adc values in some cases.
+ */
+
+ /*
+ * That's actually not the real temperature - you have to compute it
+ * as described in the datasheet.
+ */
+ my_usart_print_int(USART2, temperature);
+
+ gpio_toggle(GPIOA, GPIO8); /* LED2 on */
+
+ }
+
+ return 0;
+}
+
+void adc1_2_isr(void)
+{
+ /* Clear Injected End Of Conversion (JEOC) */
+ ADC_SR(ADC1) &= ~ADC_SR_JEOC;
+ temperature = ADC_JDR1(ADC1);
+}
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile
new file mode 100644
index 0000000..20355ce
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/Makefile
@@ -0,0 +1,27 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This library is free software: you can redistribute it and/or modify
+## it under the terms of the GNU Lesser General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library. If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = adc
+# Comment the following line if you _don't_ have luftboot flashed!
+LDFLAGS += -Wl,-Ttext=0x8002000
+CFLAGS += -std=c99
+LDSCRIPT = ../lisa-m.ld
+
+include ../../Makefile.include
+
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/README b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/README
new file mode 100644
index 0000000..0339a11
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/README
@@ -0,0 +1,12 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This is a simple example that sends the values read out from four ADC
+channels of the STM32 to the USART2.
+
+This example uses a timer trigger to sample the injected adc channels and
+then uses an interrupt routine to retrieve the samples from the data registers.
+
+The terminal settings for the receiving device/PC are 115200 8n1.
+
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
new file mode 100644
index 0000000..9331bb9
--- /dev/null
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
@@ -0,0 +1,230 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ * Copyright (C) 2012 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2012 Stephen Dwyer <dwyer.sc@gmail.com>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/adc.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
+
+volatile u16 temperature = 0;
+volatile u16 v_refint = 0;
+volatile u16 lisam_adc1 = 0;
+volatile u16 lisam_adc2 = 0;
+u8 channel_array[4]; /* for injected sampling, 4 channels max, for regular, 16 max */
+
+void usart_setup(void)
+{
+ /* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+
+ /* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
+ GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
+
+ /* Setup UART parameters. */
+ usart_set_baudrate(USART2, 115200);
+ usart_set_databits(USART2, 8);
+ usart_set_stopbits(USART2, USART_STOPBITS_1);
+ usart_set_mode(USART2, USART_MODE_TX_RX);
+ usart_set_parity(USART2, USART_PARITY_NONE);
+ usart_set_flow_control(USART2, USART_FLOWCONTROL_NONE);
+
+ /* Finally enable the USART. */
+ usart_enable(USART2);
+}
+
+void gpio_setup(void)
+{
+ /* Enable GPIO clocks. */
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+ /* Setup the LEDs. */
+ gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO8);
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
+
+ /* Setup Lisa/M v2 ADC1,2 on ANALOG1 connector */
+ gpio_set_mode(GPIOC, GPIO_MODE_INPUT, GPIO_CNF_INPUT_ANALOG, \
+ GPIO3 | GPIO0 );
+}
+
+void timer_setup(void)
+{
+ /* Set up the timer TIM2 for injected sampling */
+ uint32_t timer;
+ volatile uint32_t *rcc_apbenr;
+ uint32_t rcc_apb;
+
+ timer = TIM2;
+ rcc_apbenr = &RCC_APB1ENR;
+ rcc_apb = RCC_APB1ENR_TIM2EN;
+
+ rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+
+ /* Time Base configuration */
+ timer_reset(timer);
+ timer_set_mode(timer, TIM_CR1_CKD_CK_INT,
+ TIM_CR1_CMS_EDGE, TIM_CR1_DIR_UP);
+ timer_set_period(timer, 0xFF);
+ timer_set_prescaler(timer, 0x8);
+ timer_set_clock_division(timer, 0x0);
+ /* Generate TRGO on every update. */
+ timer_set_master_mode(timer, TIM_CR2_MMS_UPDATE);
+ timer_enable_counter(timer);
+}
+
+void irq_setup(void)
+{
+ /* Enable the adc1_2_isr() routine */
+ nvic_set_priority(NVIC_ADC1_2_IRQ, 0);
+ nvic_enable_irq(NVIC_ADC1_2_IRQ);
+}
+
+void adc_setup(void)
+{
+ int i;
+
+ rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+
+ /* Make sure the ADC doesn't run during config. */
+ adc_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
+ * generates the interrupt/EOC/JEOC flags set at the end of all channels, not each one.
+ */
+ adc_enable_scan_mode(ADC1);
+ adc_set_single_conversion_mode(ADC1);
+ /* We want to start the injected conversion with the TIM2 TRGO */
+ adc_enable_external_trigger_injected(ADC1,ADC_CR2_JEXTSEL_TIM2_TRGO);
+ /* Generate the ADC1_2_IRQ */
+ adc_enable_jeoc_interrupt(ADC1);
+ adc_set_right_aligned(ADC1);
+ /* We want to read the temperature sensor, so we have to enable it. */
+ adc_enable_temperature_sensor(ADC1);
+ adc_set_conversion_time_on_all_channels(ADC1, ADC_SMPR_SMP_28DOT5CYC);
+
+ /* Select the channels we want to convert.
+ * 16=temperature_sensor, 17=Vrefint, 13=ADC1, 10=ADC2
+ */
+ channel_array[0] = 16;
+ channel_array[1] = 17;
+ channel_array[2] = 13;
+ channel_array[3] = 10;
+ adc_set_injected_sequence(ADC1, 4, channel_array);
+
+ adc_on(ADC1);
+
+ /* Wait for ADC starting up. */
+ for (i = 0; i < 800000; i++) /* Wait a bit. */
+ __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
+}
+
+void my_usart_print_int(u32 usart, int value)
+{
+ s8 i;
+ u8 nr_digits = 0;
+ char buffer[25];
+
+ if (value < 0) {
+ usart_send_blocking(usart, '-');
+ value = value * -1;
+ }
+
+ while (value > 0) {
+ buffer[nr_digits++] = "0123456789"[value % 10];
+ value /= 10;
+ }
+
+ for (i = (nr_digits - 1); i >= 0; i--) {
+ usart_send_blocking(usart, buffer[i]);
+ }
+
+ //usart_send_blocking(usart, '\r');
+}
+
+int main(void)
+{
+
+ rcc_clock_setup_in_hse_12mhz_out_72mhz();
+ gpio_setup();
+ usart_setup();
+ timer_setup();
+ irq_setup();
+ adc_setup();
+
+ gpio_set(GPIOA, GPIO8); /* LED1 off */
+ gpio_set(GPIOC, GPIO15); /* LED5 off */
+
+ /* Send a message on USART1. */
+ usart_send_blocking(USART2, 's');
+ usart_send_blocking(USART2, 't');
+ usart_send_blocking(USART2, 'm');
+ usart_send_blocking(USART2, '\r');
+ usart_send_blocking(USART2, '\n');
+
+ /* Moved the channel selection and sequence init to adc_setup() */
+
+ /* Continously convert and poll the temperature ADC. */
+ while (1) {
+ /*
+ * Since sampling is triggered by the timer and copying the values
+ * out of the data registers is handled by the interrupt routine,
+ * we just need to print the values and toggle the LED. It may be useful
+ * to buffer the adc values in some cases.
+ */
+
+ my_usart_print_int(USART2, temperature);
+ usart_send_blocking(USART2, ' ');
+ my_usart_print_int(USART2, v_refint);
+ usart_send_blocking(USART2, ' ');
+ my_usart_print_int(USART2, lisam_adc1);
+ usart_send_blocking(USART2, ' ');
+ my_usart_print_int(USART2, lisam_adc2);
+ usart_send_blocking(USART2, '\r');
+
+ gpio_toggle(GPIOA, GPIO8); /* LED2 on */
+
+ }
+
+ return 0;
+}
+
+void adc1_2_isr(void)
+{
+ /* Clear Injected End Of Conversion (JEOC) */
+ ADC_SR(ADC1) &= ~ADC_SR_JEOC;
+ temperature = ADC_JDR1(ADC1);
+ v_refint = ADC_JDR2(ADC1);
+ lisam_adc1 = ADC_JDR3(ADC1);
+ lisam_adc2 = ADC_JDR4(ADC1);
+}