From 054b2c252b736aa0614f50477ee91e27b664f896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=20K=C3=A9vin?= Date: Thu, 14 Jun 2018 13:21:16 +0200 Subject: [PATCH] BV UART: use enhanced USART to add additional data bits and parity support --- lib/busvoodoo_uart.c | 131 ++++++++++--------------------------------- 1 file changed, 30 insertions(+), 101 deletions(-) diff --git a/lib/busvoodoo_uart.c b/lib/busvoodoo_uart.c index 99fcbe4..9b34afa 100644 --- a/lib/busvoodoo_uart.c +++ b/lib/busvoodoo_uart.c @@ -32,6 +32,7 @@ #include "global.h" // board definitions #include "print.h" // printing utilities #include "menu.h" // menu definitions +#include "usart_enhanced.h" // utilities for USART enhancements #include "busvoodoo_global.h" // BusVoodoo definitions #include "busvoodoo_oled.h" // OLED utilities #include "busvoodoo_uart.h" // own definitions @@ -58,7 +59,7 @@ static uint32_t busvoodoo_uart_baudrate = 115200; /** UART data bits */ static uint8_t busvoodoo_uart_databits = 8; /** UART parity setting */ -static uint32_t busvoodoo_uart_parity = USART_PARITY_NONE; +static enum usart_enhanced_parity_t busvoodoo_uart_parity = USART_ENHANCED_PARITY_NONE; /** UART stop bits setting */ static uint32_t busvoodoo_uart_stopbits = USART_STOPBITS_1; /** UART hardware flow control setting (true = with hardware flow control, false = without hardware flow control */ @@ -81,7 +82,7 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) } switch (busvoodoo_uart_setting) { case BUSVOODOO_UART_SETTING_NONE: - snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "baud rate in bps (1-2000000) [%u]", busvoodoo_uart_baudrate); + snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "baud rate in bps (1200-2000000) [%u]", busvoodoo_uart_baudrate); *prefix = busvoodoo_global_string; // ask for baud rate busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_BAUDRATE; break; @@ -96,16 +97,16 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) } } if (BUSVOODOO_UART_SETTING_DATABITS==busvoodoo_uart_setting) { // if next setting - snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "data bits (8-9) [%u]", busvoodoo_uart_databits); // prepare next setting + snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "data bits (5-8) [%u]", busvoodoo_uart_databits); // prepare next setting *prefix = busvoodoo_global_string; // display next setting } break; case BUSVOODOO_UART_SETTING_DATABITS: if (NULL==line || 0==strlen(line)) { // use default setting busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_PARITY; // go to next setting - } else { // setting provided + } else if (1==strlen(line)) { // setting provided uint8_t databits = atoi(line); // parse setting - if (8==databits || 9==databits) { // check setting + if (databits>=5 && databits<=8) { // check setting busvoodoo_uart_databits = databits; // remember setting busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_PARITY; // go to next setting } @@ -114,7 +115,9 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) printf("1) none\n"); printf("2) even\n"); printf("3) odd\n"); - snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "parity (1,2,3) [%c]", USART_PARITY_NONE==busvoodoo_uart_parity ? '1' : (USART_PARITY_EVEN==busvoodoo_uart_parity ? '2' : '3')); // prepare next setting + printf("4) mark\n"); + printf("5) space\n"); + snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "parity (1,2,3,4,5) [%u]", busvoodoo_uart_parity+1); // prepare next setting *prefix = busvoodoo_global_string; // display next setting } break; @@ -122,14 +125,9 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) if (NULL==line || 0==strlen(line)) { // use default setting busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_STOPBITS; // go to next setting } else if (1==strlen(line)) { // setting provided - if ('1'==line[0]) { // no parity - busvoodoo_uart_parity = USART_PARITY_NONE; - busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_STOPBITS; // go to next setting - } else if ('2'==line[0]) { // even parity - busvoodoo_uart_parity = USART_PARITY_EVEN; - busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_STOPBITS; // go to next setting - } else if ('3'==line[0]) { // odd parity - busvoodoo_uart_parity = USART_PARITY_ODD; + uint8_t parity = atoi(line); // parse setting + if (parity>0 && parity<6) { // check settin + busvoodoo_uart_parity = parity-1; busvoodoo_uart_setting = BUSVOODOO_UART_SETTING_STOPBITS; // go to next setting } } @@ -138,7 +136,7 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) printf("2) 1\n"); printf("3) 1.5\n"); printf("4) 2\n"); - snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "stop bits (1,2,3,4) [%s]", USART_STOPBITS_0_5==busvoodoo_uart_stopbits ? "0.5" : (USART_STOPBITS_1==busvoodoo_uart_stopbits ? "1" : (USART_STOPBITS_1_5==busvoodoo_uart_stopbits ? "1.5" : "2.0"))); // prepare next setting + snprintf(busvoodoo_global_string, LENGTH(busvoodoo_global_string), "stop bits (1,2,3,4) [%c]", USART_STOPBITS_0_5==busvoodoo_uart_stopbits ? '1' : (USART_STOPBITS_1==busvoodoo_uart_stopbits ? '2' : (USART_STOPBITS_1_5==busvoodoo_uart_stopbits ? '3' : '4'))); // prepare next setting *prefix = busvoodoo_global_string; // display next setting } break; @@ -198,9 +196,9 @@ static bool busvoodoo_uart_setup(char** prefix, const char* line) if (BUSVOODOO_UART_SETTING_DONE==busvoodoo_uart_setting) { // we have all settings, configure UART rcc_periph_clock_enable(RCC_AFIO); // enable clock for USART alternate function rcc_periph_clock_enable(RCC_USART(BUSVOODOO_USART_ID)); // enable clock for USART peripheral + rcc_periph_reset_pulse(RST_USART(BUSVOODOO_USART_ID)); // reset USART peripheral usart_set_baudrate(USART(BUSVOODOO_USART_ID), busvoodoo_uart_baudrate); // set baud rate - usart_set_databits(USART(BUSVOODOO_USART_ID), busvoodoo_uart_databits); // set data bits - usart_set_parity(USART(BUSVOODOO_USART_ID), busvoodoo_uart_parity); // set parity + usart_enhanced_config(USART(BUSVOODOO_USART_ID), busvoodoo_uart_databits, busvoodoo_uart_parity); // use enhanced USART to configure the USART peripherals, supporting more data-bits and parity configurations usart_set_stopbits(USART(BUSVOODOO_USART_ID), busvoodoo_uart_stopbits); // set stop bits if (busvoodoo_uart_hwflowctl) { usart_set_flow_control(USART(BUSVOODOO_USART_ID), USART_FLOWCONTROL_RTS_CTS); // set RTS/CTS flow control @@ -277,34 +275,15 @@ static void busvoodoo_uart_exit(void) /** write to UART * @param[in] value value to write */ -static void busvoodoo_uart_write(uint16_t value) +static void busvoodoo_uart_write(uint8_t value) { while ((0==(USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) && !user_input_available)); // wait for transmit buffer to be empty (or user to interrupt) - if (USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) { // we can send a character - // remove unused bits - if (USART_PARITY_NONE==busvoodoo_uart_parity) { // no parity bit in frame - if (8==busvoodoo_uart_databits) { // 8-bit frame - value &= 0xff; - } else { // 9-bit frame - value &= 0x1ff; - } - } else { // MSb is parity bit - if (8==busvoodoo_uart_databits) { // 8-bit frame - value &= 0x7f; - } else { // 9-bit frame - value &= 0xff; - } - } + if (USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) { // we can send data // send data busvoodoo_led_blue_pulse(BUSVOODOO_LED_PULSE); // pulse blue LED to show transmission - usart_send(USART(BUSVOODOO_USART_ID), value); // transmit character + usart_enhanced_send(USART(BUSVOODOO_USART_ID), value); // transmit data // display data send - printf("write: '%c'/0x", value); - if ((USART_PARITY_NONE==busvoodoo_uart_parity) && 9==busvoodoo_uart_databits) { // case where the final data is 9 bits long - printf("%03x\n", value); - } else { - printf("%02x\n", value); - } + printf("write: '%c'/0x%02x\n", value, value); } } @@ -319,36 +298,16 @@ static void busvoodoo_uart_read(void) // get the errors bool error_noise = (0!=(USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_NE)); // read noise error flag bool error_framing = (0!=(USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_FE)); // read frame error flag - bool error_parity = (0!=(USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_PE)); // read parity error flag - uint16_t c = usart_recv(USART(BUSVOODOO_USART_ID)); // read received character (also clears the error flags) - // remove unused bits - if (USART_PARITY_NONE==busvoodoo_uart_parity) { // no parity bit in frame - if (8==busvoodoo_uart_databits) { // 8-bit frame - c &= 0xff; - } else { // 9-bit frame - c &= 0x1ff; - } - } else { // MSb is parity bit - if (8==busvoodoo_uart_databits) { // 8-bit frame - c &= 0x7f; - } else { // 9-bit frame - c &= 0xff; - } - } + uint8_t input = usart_enhanced_recv(USART(BUSVOODOO_USART_ID)); // read received character (also clears the error flags) // display data - printf("'%c'/0x", c); - if ((USART_PARITY_NONE==busvoodoo_uart_parity) && 9==busvoodoo_uart_databits) { // case where the final data is 9 bits long - printf("%03x ", c); - } else { - printf("%02x ", c); - } + printf("'%c'/0x%02x", input, input); // display errors printf("("); if (error_noise) { printf("noise"); } else if (error_framing) { printf("framing"); - } else if (error_parity) { + } else if (usart_enhanced_parity_error(USART(BUSVOODOO_USART_ID))) { printf("parity"); } else { printf("no"); @@ -512,7 +471,7 @@ static void busvoodoo_uart_command_transmit(void* argument) if (USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) { // we can send a character printf("%c", ((char*)(argument))[i]); // echo character to transmit busvoodoo_led_blue_pulse(BUSVOODOO_LED_PULSE); // pulse blue LED to show transmission - usart_send(USART(BUSVOODOO_USART_ID), ((char*)(argument))[i]); // transmit character + usart_enhanced_send(USART(BUSVOODOO_USART_ID), ((char*)(argument))[i]); // transmit character } } if (user_input_available) { // user interrupted flow @@ -543,44 +502,14 @@ static void busvoodoo_uart_command_receive(void* argument) printf("press any key to exit\n"); while (!user_input_available) { // check for user input to exit if ((USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_RXNE)) { // verify if data has been received - uint16_t c = usart_recv(USART(BUSVOODOO_USART_ID)); // receive character + uint8_t input = usart_enhanced_recv(USART(BUSVOODOO_USART_ID)); // receive character busvoodoo_led_blue_pulse(BUSVOODOO_LED_PULSE); // enable blue LED to show reception - // remove unused bits (ignore parity bit) - if (USART_PARITY_NONE==busvoodoo_uart_parity) { // no parity bit in frame - if (8==busvoodoo_uart_databits) { // 8-bit frame - c &= 0xff; - } else { // 9-bit frame - c &= 0x1ff; - } - } else { // MSb is parity bit - if (8==busvoodoo_uart_databits) { // 8-bit frame - c &= 0x7f; - } else { // 9-bit frame - c &= 0xff; - } - } if (display_hex) { // display data in hex - if ((USART_PARITY_NONE==busvoodoo_uart_parity) && 9==busvoodoo_uart_databits) { // case where the final data is 9 bits long - printf("%03x ", c); - } else { - printf("%02x ", c); - } + printf("%02x ", input); } else if (display_bin) { // display data in binary - if (USART_PARITY_NONE==busvoodoo_uart_parity) { - if (8==busvoodoo_uart_databits) { // 8-bit frame - printf("%08b ", c); - } else { // 9-bit frame - printf("%09b ", c); - } - } else { // one bit is a parity bit - if (8==busvoodoo_uart_databits) { // 8-bit frame - printf("%07b ", c); - } else { // 9-bit frame - printf("%08b ", c); - } - } + printf("%08b ", input); } else { // display in ASCII - printf("%c", c); // print received character + printf("%c", input); // print received character } } } @@ -610,7 +539,7 @@ static void busvoodoo_uart_command_transceive(void* argument) if (esc_count<5) { // check for escape sequence while ((0==(USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) && !user_input_available)); // wait for transmit buffer to be empty if (USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_TXE) { // we can send a character - usart_send_blocking(USART(BUSVOODOO_USART_ID), c); // send user character + usart_enhanced_send(USART(BUSVOODOO_USART_ID), c); // send user character busvoodoo_led_blue_pulse(BUSVOODOO_LED_PULSE); // enable blue LED to show transmission } } else { // user wants to exit @@ -618,9 +547,9 @@ static void busvoodoo_uart_command_transceive(void* argument) } } if ((USART_SR(USART(BUSVOODOO_USART_ID)) & USART_SR_RXNE)) { // verify if data has been received - char c = usart_recv(USART(BUSVOODOO_USART_ID)); // receive character + char input = usart_enhanced_recv(USART(BUSVOODOO_USART_ID)); // receive character busvoodoo_led_blue_pulse(BUSVOODOO_LED_PULSE); // enable blue LED to show reception - printf("%c", c); // print received character + printf("%c", input); // print received character } } printf("\n"); // get to next line