EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched from USART 2 to USART 1.

Browse Source
This commit is contained in:
kbob
2015-01-21 02:00:08 -08:00
parent 71b2c1991f
commit 7629bb01e6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/stm32/f4/stm32f4-disco/lcd-serial/console.c
View File

@@ -47,9 +47,9 @@ volatile int recv_ndx_nxt; // Next place to store
volatile int recv_ndx_cur; // Next place to read volatile int recv_ndx_cur; // Next place to read
/* For interrupt handling we add a new function which is called /* For interrupt handling we add a new function which is called
* when recieve interrupts happen. The name (usart2_isr) is created * when recieve interrupts happen. The name (usart1_isr) is created
* by the irq.json file in libopencm3 calling this interrupt for * by the irq.json file in libopencm3 calling this interrupt for
* USART2 'usart2', adding the suffix '_isr', and then weakly binding * USART1 'usart1', adding the suffix '_isr', and then weakly binding
* it to the 'do nothing' interrupt function in vec.c. * it to the 'do nothing' interrupt function in vec.c.
* *
* By defining it in this file the linker will override that weak * By defining it in this file the linker will override that weak
@@ -57,7 +57,7 @@ volatile int recv_ndx_cur; // Next place to read
* right or it won't work. And you'll wonder where your interrupts * right or it won't work. And you'll wonder where your interrupts
* are going. * are going.
*/ */
void usart2_isr(void) { void usart1_isr(void) {
uint32_t reg; uint32_t reg;
int i; int i;
@@ -191,29 +191,29 @@ int console_gets(char *s, int len) {
void console_setup(int baud) { void console_setup(int baud) {
/* MUST enable the GPIO clock in ADDITION to the USART clock */ /* MUST enable the GPIO clock in ADDITION to the USART clock */
rcc_periph_clock_enable(RCC_GPIOD); rcc_periph_clock_enable(RCC_GPIOA);
/* This example uses PD5 and PD6 for Tx and Rx respectively /* This example uses PD5 and PD6 for Tx and Rx respectively
* but other pins are available for this role on USART2 (our chosen * but other pins are available for this role on USART1 (our chosen
* USART) as well, such as PA2 and PA3. You can also split them * USART) as well, such as PA2 and PA3. You can also split them
* so PA2 for Tx, PD6 for Rx but you would have to enable both * so PA2 for Tx, PD6 for Rx but you would have to enable both
* the GPIOA and GPIOD clocks in that case * the GPIOA and GPIOD clocks in that case
*/ */
gpio_mode_setup(GPIOD, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO5 | GPIO6); gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9 | GPIO10);
/* Actual Alternate function number (in this case 7) is part /* Actual Alternate function number (in this case 7) is part
* depenedent, CHECK THE DATA SHEET for the right number to * depenedent, CHECK THE DATA SHEET for the right number to
* use. * use.
*/ */
gpio_set_af(GPIOD, GPIO_AF7, GPIO5 | GPIO6); gpio_set_af(GPIOA, GPIO_AF7, GPIO9 | GPIO10);
/* This then enables the clock to the USART2 peripheral which is /* This then enables the clock to the USART1 peripheral which is
* attached inside the chip to the APB2 bus. Different peripherals * attached inside the chip to the APB2 bus. Different peripherals
* attach to different buses, and even some UARTS are attached to * attach to different buses, and even some UARTS are attached to
* APB1 and some to APB2, again the data sheet is useful here. * APB1 and some to APB2, again the data sheet is useful here.
*/ */
rcc_periph_clock_enable(RCC_USART2); rcc_periph_clock_enable(RCC_USART1);
/* Set up USART/UART parameters using the libopencm3 helper functions */ /* Set up USART/UART parameters using the libopencm3 helper functions */
usart_set_baudrate(CONSOLE_UART, baud); usart_set_baudrate(CONSOLE_UART, baud);
@@ -225,7 +225,7 @@ void console_setup(int baud) {
usart_enable(CONSOLE_UART); usart_enable(CONSOLE_UART);
/* Enable interrupts from the USART */ /* Enable interrupts from the USART */
nvic_enable_irq(NVIC_USART2_IRQ); nvic_enable_irq(NVIC_USART1_IRQ);
/* Specifically enable recieve interrupts */ /* Specifically enable recieve interrupts */
usart_enable_rx_interrupt(CONSOLE_UART); usart_enable_rx_interrupt(CONSOLE_UART);

2
examples/stm32/f4/stm32f4-disco/lcd-serial/console.h
View File

@@ -36,7 +36,7 @@
*/ */
#define CONSOLE_UART USART2 #define CONSOLE_UART USART1
/* /*
* Our simple console definitions * Our simple console definitions