From 2bc1025bc51ac30b4022d078cb5565920e6985c1 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Wed, 16 Nov 2011 18:16:48 -0800 Subject: Updated all examples to use the new/old usart_set_baudrate api. --- examples/stm32/f1/obldc/usart/usart.c | 2 +- examples/stm32/f1/obldc/usart_irq/usart_irq.c | 2 +- examples/stm32/f1/other/adc_temperature_sensor/adc.c | 2 +- examples/stm32/f1/other/dma_mem2mem/dma.c | 2 +- examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c | 2 +- examples/stm32/f1/other/rtc/rtc.c | 2 +- examples/stm32/f1/stm32-h103/usart/usart.c | 6 +++--- examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c | 2 +- examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c | 2 +- examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c | 2 +- examples/stm32/f2/jobygps/spi_test/spi_test.c | 5 ++++- examples/stm32/f2/jobygps/usart_printf/usart_printf.c | 5 ++++- examples/stm32/f4/stm32f4-discovery/usart/usart.c | 2 +- 13 files changed, 21 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/stm32/f1/obldc/usart/usart.c b/examples/stm32/f1/obldc/usart/usart.c index 70959d3..855b40b 100644 --- a/examples/stm32/f1/obldc/usart/usart.c +++ b/examples/stm32/f1/obldc/usart/usart.c @@ -47,7 +47,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_RE_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 230400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX); diff --git a/examples/stm32/f1/obldc/usart_irq/usart_irq.c b/examples/stm32/f1/obldc/usart_irq/usart_irq.c index 6309233..63e0365 100644 --- a/examples/stm32/f1/obldc/usart_irq/usart_irq.c +++ b/examples/stm32/f1/obldc/usart_irq/usart_irq.c @@ -52,7 +52,7 @@ void usart_setup(void) GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RE_RX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 230400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c index 1f2f9ef..454c032 100644 --- a/examples/stm32/f1/other/adc_temperature_sensor/adc.c +++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c @@ -34,7 +34,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 115200); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX_RX); diff --git a/examples/stm32/f1/other/dma_mem2mem/dma.c b/examples/stm32/f1/other/dma_mem2mem/dma.c index ee65db9..fa411db 100644 --- a/examples/stm32/f1/other/dma_mem2mem/dma.c +++ b/examples/stm32/f1/other/dma_mem2mem/dma.c @@ -34,7 +34,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 115200); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX_RX); diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c index b274a8d..179f7c9 100644 --- a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c +++ b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c @@ -35,7 +35,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 115200); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX_RX); diff --git a/examples/stm32/f1/other/rtc/rtc.c b/examples/stm32/f1/other/rtc/rtc.c index 3a086a7..1b8cfd7 100644 --- a/examples/stm32/f1/other/rtc/rtc.c +++ b/examples/stm32/f1/other/rtc/rtc.c @@ -43,7 +43,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 38400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX); diff --git a/examples/stm32/f1/stm32-h103/usart/usart.c b/examples/stm32/f1/stm32-h103/usart/usart.c index b195960..9977d7d 100644 --- a/examples/stm32/f1/stm32-h103/usart/usart.c +++ b/examples/stm32/f1/stm32-h103/usart/usart.c @@ -44,7 +44,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 38400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_mode(USART1, USART_MODE_TX); @@ -59,7 +59,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency); + usart_set_baudrate(USART2, 38400); usart_set_databits(USART2, 8); usart_set_stopbits(USART2, USART_STOPBITS_1); usart_set_mode(USART2, USART_MODE_TX); @@ -74,7 +74,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART3, 38400, rcc_ppre1_frequency); + usart_set_baudrate(USART3, 38400); usart_set_databits(USART3, 8); usart_set_stopbits(USART3, USART_STOPBITS_1); usart_set_mode(USART3, USART_MODE_TX); diff --git a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c index 8237c63..72e94d9 100644 --- a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c +++ b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c @@ -48,7 +48,7 @@ void usart_setup(void) GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 230400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c index ce9cbd7..854afbe 100644 --- a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c +++ b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c @@ -140,7 +140,7 @@ void usart_setup(void) GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 230400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c index e5693f1..e4de549 100644 --- a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c +++ b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c @@ -44,7 +44,7 @@ void usart_setup(void) GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency); + usart_set_baudrate(USART1, 230400); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f2/jobygps/spi_test/spi_test.c b/examples/stm32/f2/jobygps/spi_test/spi_test.c index d711e4c..0f3d0ed 100644 --- a/examples/stm32/f2/jobygps/spi_test/spi_test.c +++ b/examples/stm32/f2/jobygps/spi_test/spi_test.c @@ -28,6 +28,9 @@ void clock_setup(void) { + +#warning "This code has to call some kind of rcc clock setup function!!!" + RCC_APB1ENR |= RCC_APB1ENR_SPI2EN; RCC_APB2ENR |= RCC_APB2ENR_USART1EN; RCC_AHB1ENR |= @@ -55,7 +58,7 @@ void usart_setup(void) gpio_set_af(GPIOA, GPIO_AF7, GPIO9 | GPIO10); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 9600, 16000000); + usart_set_baudrate(USART1, 9600); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f2/jobygps/usart_printf/usart_printf.c b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c index de1c739..eeeb118 100644 --- a/examples/stm32/f2/jobygps/usart_printf/usart_printf.c +++ b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c @@ -28,6 +28,9 @@ void clock_setup(void) { + +#warning "This code has to call some kind of rcc clock setup function!!!" + //rcc_clock_setup_in_hse_8mhz_out_72mhz(); /* Enable GPIOA clock (for LED GPIOs). */ @@ -46,7 +49,7 @@ void usart_setup(void) gpio_set_af(GPIOA, GPIO_AF7, GPIO9 | GPIO10); /* Setup UART parameters. */ - usart_set_baudrate(USART1, 9600, 16000000); + usart_set_baudrate(USART1, 9600); usart_set_databits(USART1, 8); usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_parity(USART1, USART_PARITY_NONE); diff --git a/examples/stm32/f4/stm32f4-discovery/usart/usart.c b/examples/stm32/f4/stm32f4-discovery/usart/usart.c index d0e6f1b..f9a41d2 100644 --- a/examples/stm32/f4/stm32f4-discovery/usart/usart.c +++ b/examples/stm32/f4/stm32f4-discovery/usart/usart.c @@ -35,7 +35,7 @@ void clock_setup(void) void usart_setup(void) { /* Setup USART2 parameters. */ - usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency); + usart_set_baudrate(USART2, 38400); usart_set_databits(USART2, 8); usart_set_stopbits(USART2, USART_STOPBITS_1); usart_set_mode(USART2, USART_MODE_TX); -- cgit v1.2.3