diff options
author | Karl Palsson <karlp@tweak.net.au> | 2017-10-24 23:48:55 +0000 |
---|---|---|
committer | Karl Palsson <karlp@tweak.net.au> | 2017-10-24 23:48:55 +0000 |
commit | d35d362699d1bbcf2eee48b38684612d2f0165d6 (patch) | |
tree | bfa8178f1110d36d9ed91b04e1eb1444066c4daf | |
parent | a549503ade8bb29d7234c3d4c61ed6cab433dd0b (diff) | |
download | olsndot-d35d362699d1bbcf2eee48b38684612d2f0165d6.tar.gz olsndot-d35d362699d1bbcf2eee48b38684612d2f0165d6.tar.bz2 olsndot-d35d362699d1bbcf2eee48b38684612d2f0165d6.zip |
uart-basic: add f0, requires newest code too
stupid f072 disco doesn't have usart2 available
-rw-r--r-- | tests/uart-basic/Makefile.stm32f072disco | 26 | ||||
-rw-r--r-- | tests/uart-basic/main-stm32f072disco.c | 64 | ||||
-rw-r--r-- | tests/uart-basic/uart-basic.c | 2 |
3 files changed, 91 insertions, 1 deletions
diff --git a/tests/uart-basic/Makefile.stm32f072disco b/tests/uart-basic/Makefile.stm32f072disco new file mode 100644 index 0000000..c7fd490 --- /dev/null +++ b/tests/uart-basic/Makefile.stm32f072disco @@ -0,0 +1,26 @@ +# This is just a makefile. +# Consider it released into the public domain, or, where not available, +# available under your choice of BSD2clause, MIT, X11, ISC or Apache2 licenses +# Karl Palsson <karlp@tweak.net.au> +BOARD = stm32f072disco +PROJECT = uart-basic-$(BOARD) +BUILD_DIR = bin-$(BOARD) + +SHARED_DIR = ../../shared + +CFILES = main-$(BOARD).c +CFILES += uart-basic.c + +VPATH += $(SHARED_DIR) + +INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) + +OPENCM3_DIR=../../libopencm3/ + +### This section can go to an arch shared rules eventually... +DEVICE=stm32f072rb +#OOCD_INTERFACE = stlink-v2 +#OOCD_TARGET = stm32f0x +OOCD_FILE = ../../openocd/openocd.$(BOARD).cfg + +include ../../rules.mk diff --git a/tests/uart-basic/main-stm32f072disco.c b/tests/uart-basic/main-stm32f072disco.c new file mode 100644 index 0000000..fdd630e --- /dev/null +++ b/tests/uart-basic/main-stm32f072disco.c @@ -0,0 +1,64 @@ +/* + * Oct 2017 Karl Palsson <karlp@tweak.net.au> + */ + +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <libopencm3/cm3/nvic.h> +#include <libopencm3/stm32/gpio.h> +#include <libopencm3/stm32/rcc.h> +#include <libopencm3/stm32/usart.h> + +#include "uart-basic.h" + +#define LED_DISCO_GREEN_RCC RCC_GPIOC +#define LED_DISCO_GREEN_PORT GPIOC +#define LED_DISCO_GREEN_PIN GPIO9 + +void usart3_4_isr(void) +{ + ub_irq_handler(); +} + +static void board_init(void) { + rcc_periph_clock_enable(RCC_GPIOB); + gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO10|GPIO11); + /* usart3 is AF4 */ + gpio_set_af(GPIOB, GPIO_AF4, GPIO10|GPIO11); +} + +int main(void) +{ + int i; + int j = 0; + rcc_clock_setup_in_hsi48_out_48mhz(); + board_init(); + struct ub_hw ub = { + .uart = USART3, + .uart_nvic = NVIC_USART3_4_IRQ, + .uart_rcc = RCC_USART3, + }; + ub_init(&ub); + printf("hi guys!\n"); + /* green led for ticking */ + rcc_periph_clock_enable(LED_DISCO_GREEN_RCC); + gpio_mode_setup(LED_DISCO_GREEN_PORT, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, + LED_DISCO_GREEN_PIN); + + + while (1) { + gpio_toggle(LED_DISCO_GREEN_PORT, LED_DISCO_GREEN_PIN); + + for (i = 0; i < 0xa0000; i++) { /* Wait a bit. */ + __asm__("NOP"); + } + ub_task(); + gpio_toggle(LED_DISCO_GREEN_PORT, LED_DISCO_GREEN_PIN); + for (i = 0; i < 0xa0000; i++) { /* Wait a bit. */ + __asm__("NOP"); + } + } + + return 0; +} diff --git a/tests/uart-basic/uart-basic.c b/tests/uart-basic/uart-basic.c index 4dae0e1..8c5124c 100644 --- a/tests/uart-basic/uart-basic.c +++ b/tests/uart-basic/uart-basic.c @@ -65,7 +65,7 @@ void ub_task(void) void ub_irq_handler(void) { - if (usart_get_flag(ub->uart, USART_SR_RXNE)) { + if (usart_get_flag(ub->uart, USART_FLAG_RXNE)) { last_rxb = usart_recv(ub->uart); } } |