aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c3
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c3
-rw-r--r--examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c3
-rw-r--r--examples/stm32/f1/other/usb_cdcacm/cdcacm.c3
-rw-r--r--examples/stm32/f1/other/usb_dfu/usbdfu.c3
-rw-r--r--examples/stm32/f1/other/usb_hid/usbhid.c3
-rw-r--r--examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c3
-rw-r--r--examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c3
-rw-r--r--examples/stm32/f1/stm32-h103/usb_hid/usbhid.c3
-rw-r--r--examples/stm32/f1/stm32-h103/usb_iap/usbiap.c3
-rw-r--r--examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c3
-rw-r--r--examples/stm32/f4/stm32f4-discovery/usart_irq/Makefile25
-rw-r--r--examples/stm32/f4/stm32f4-discovery/usart_irq/README14
-rw-r--r--examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c115
-rw-r--r--examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c3
15 files changed, 166 insertions, 24 deletions
diff --git a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
index c72b715..1f98e70 100644
--- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
@@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"CDC-ACM Demo",
"DEMO",
@@ -250,7 +249,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
- usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++)
diff --git a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
index 8607191..018306a 100644
--- a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
@@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"DFU Demo",
"DEMO",
@@ -250,7 +249,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
- usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback(
usbd_dev,
diff --git a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
index bb0baba..e77ade0 100644
--- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
+++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
@@ -169,7 +169,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"HID Demo",
"DEMO",
@@ -336,7 +335,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
- usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, hid_set_config);
/* Delay some seconds to show that pull-up switch works. */
diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
index 3aa7289..e841ef7 100644
--- a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
@@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"CDC-ACM Demo",
"DEMO",
@@ -242,7 +241,7 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
gpio_set(GPIOA, GPIO15);
diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c
index 8c7493f..d1efe4a 100644
--- a/examples/stm32/f1/other/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/other/usb_dfu/usbdfu.c
@@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"DFU Demo",
"DEMO",
@@ -251,7 +250,7 @@ int main(void)
rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
- usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 5);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback(
usbd_dev,
diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
index 0231610..a3b78d5 100644
--- a/examples/stm32/f1/other/usb_hid/usbhid.c
+++ b/examples/stm32/f1/other/usb_hid/usbhid.c
@@ -165,7 +165,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"HID Demo",
"DEMO",
@@ -254,7 +253,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, hid_set_config);
gpio_set(GPIOA, GPIO15);
diff --git a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
index 485f3ee..1dd47c0 100644
--- a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -158,7 +158,6 @@ static const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"CDC-ACM Demo",
"DEMO",
@@ -244,7 +243,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
for (i = 0; i < 0x800000; i++)
diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
index 33a8983..95c51cb 100644
--- a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
@@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"DFU Demo",
"DEMO",
@@ -249,7 +248,7 @@ int main(void)
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
gpio_set(GPIOC, GPIO11);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback(
usbd_dev,
diff --git a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
index 360a3cd..2073096 100644
--- a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
@@ -163,7 +163,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"HID Demo",
"DEMO",
@@ -256,7 +255,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, hid_set_config);
for (i = 0; i < 0x80000; i++)
diff --git a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
index 2a122af..4db224c 100644
--- a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
@@ -106,7 +106,6 @@ const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"DFU Demo",
"DEMO",
@@ -249,7 +248,7 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 5);
+ usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4);
usbd_set_control_buffer_size(usbd_dev, sizeof(usbd_control_buffer));
usbd_register_control_callback(
usbd_dev,
diff --git a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
index aa0c282..4b930dd 100644
--- a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
+++ b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
@@ -69,7 +69,6 @@ const struct usb_config_descriptor config = {
};
const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"Simple Device",
"1001",
@@ -108,7 +107,7 @@ int main(void)
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO6);
- usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_control_callback(
usbd_dev,
USB_REQ_TYPE_VENDOR,
diff --git a/examples/stm32/f4/stm32f4-discovery/usart_irq/Makefile b/examples/stm32/f4/stm32f4-discovery/usart_irq/Makefile
new file mode 100644
index 0000000..b7bbd14
--- /dev/null
+++ b/examples/stm32/f4/stm32f4-discovery/usart_irq/Makefile
@@ -0,0 +1,25 @@
+##
+## 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 = usart_irq
+
+LDSCRIPT = ../stm32f4-discovery.ld
+
+include ../../Makefile.include
+
diff --git a/examples/stm32/f4/stm32f4-discovery/usart_irq/README b/examples/stm32/f4/stm32f4-discovery/usart_irq/README
new file mode 100644
index 0000000..ac859a9
--- /dev/null
+++ b/examples/stm32/f4/stm32f4-discovery/usart_irq/README
@@ -0,0 +1,14 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This example program echoes data sent in on USART2 on the
+ST STM32F4DISCOVERY eval board. Uses interrupts for that purpose.
+
+Connect your TTL RX device line to PA2 on the discovery board.
+Connect your TTL TX device line to PA3 on the discovery board.
+
+The terminal settings for the receiving device/PC are 38400 8n1.
+
+The sending is done in a blocking way in the code.
+
diff --git a/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c b/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c
new file mode 100644
index 0000000..8e7aa7f
--- /dev/null
+++ b/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2011 Stephen Caudle <scaudle@doceme.com>
+ * Copyright (C) 2013 Piotr Esden-Tempski <piotr@esden.net>
+ *
+ * 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/f4/rcc.h>
+#include <libopencm3/stm32/f4/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/cm3/nvic.h>
+
+void clock_setup(void)
+{
+ /* Enable GPIOD clock for LED & USARTs. */
+ rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+ rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+
+ /* Enable clocks for USART2. */
+ rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+}
+
+void usart_setup(void)
+{
+ /* Enable the USART2 interrupt. */
+ nvic_enable_irq(NVIC_USART2_IRQ);
+
+ /* Setup GPIO pins for USART2 transmit. */
+ gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO2);
+
+ /* Setup GPIO pins for USART2 receive. */
+ gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO3);
+ gpio_set_output_options(GPIOA, GPIO_OTYPE_OD, GPIO_OSPEED_25MHZ, GPIO3);
+
+ /* Setup USART2 TX and RX pin as alternate function. */
+ gpio_set_af(GPIOA, GPIO_AF7, GPIO2);
+ gpio_set_af(GPIOA, GPIO_AF7, GPIO3);
+
+ /* Setup USART2 parameters. */
+ usart_set_baudrate(USART2, 38400);
+ 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);
+
+ /* Enable USART2 Receive interrupt. */
+ usart_enable_rx_interrupt(USART2);
+
+ /* Finally enable the USART. */
+ usart_enable(USART2);
+}
+
+void gpio_setup(void)
+{
+ /* Setup GPIO pin GPIO12 on GPIO port D for LED. */
+ gpio_mode_setup(GPIOD, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO12);
+}
+
+int main(void)
+{
+ clock_setup();
+ gpio_setup();
+ usart_setup();
+
+ while (1) {
+ __asm__("NOP");
+ }
+
+ return 0;
+}
+
+void usart2_isr(void)
+{
+ static u8 data = 'A';
+
+ /* Check if we were called because of RXNE. */
+ if (((USART_CR1(USART2) & USART_CR1_RXNEIE) != 0) &&
+ ((USART_SR(USART2) & USART_SR_RXNE) != 0)) {
+
+ /* Indicate that we got data. */
+ gpio_toggle(GPIOD, GPIO12);
+
+ /* Retrieve the data from the peripheral. */
+ data = usart_recv(USART2);
+
+ /* Enable transmit interrupt so it sends back the data. */
+ usart_enable_tx_interrupt(USART2);
+ }
+
+ /* Check if we were called because of TXE. */
+ if (((USART_CR1(USART2) & USART_CR1_TXEIE) != 0) &&
+ ((USART_SR(USART2) & USART_SR_TXE) != 0)) {
+
+ /* Put data into the transmit register. */
+ usart_send(USART2, data);
+
+ /* Disable the TXE interrupt as we don't need it anymore. */
+ usart_disable_tx_interrupt(USART2);
+ }
+}
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
index 0e19dbb..80c700b 100644
--- a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
@@ -159,7 +159,6 @@ static const struct usb_config_descriptor config = {
};
static const char *usb_strings[] = {
- "x",
"Black Sphere Technologies",
"CDC-ACM Demo",
"DEMO",
@@ -233,7 +232,7 @@ int main(void)
GPIO9 | GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
- usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 4);
+ usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config, usb_strings, 3);
usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
while (1)