From 6920c1159b6e27ef8706647dd82af4910c6fc6bb Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Tue, 7 Mar 2023 16:01:36 -0300 Subject: [PATCH] rework serial config --- examples/ti/ek-tm4c1294xl-baremetal/Makefile | 2 +- examples/ti/ek-tm4c1294xl-baremetal/hal.h | 22 ++++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/examples/ti/ek-tm4c1294xl-baremetal/Makefile b/examples/ti/ek-tm4c1294xl-baremetal/Makefile index f68f8c5c..7aaa9c73 100644 --- a/examples/ti/ek-tm4c1294xl-baremetal/Makefile +++ b/examples/ti/ek-tm4c1294xl-baremetal/Makefile @@ -40,7 +40,7 @@ DEVICE_URL ?= https://dash.vcon.io/api/v3/devices/1 update: firmware.bin curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/ota --data-binary @$< -test update: CFLAGS_EXTRA += -DUART_DEBUG=UART1 +test update: CFLAGS_EXTRA += -DUART_DEBUG=UART0 test: update curl --fail-with-body -su :$(VCON_API_KEY) $(DEVICE_URL)/tx?t=5 | tee /tmp/output.txt grep 'READY, IP:' /tmp/output.txt # Check for network init diff --git a/examples/ti/ek-tm4c1294xl-baremetal/hal.h b/examples/ti/ek-tm4c1294xl-baremetal/hal.h index 457d2999..d116f7ed 100644 --- a/examples/ti/ek-tm4c1294xl-baremetal/hal.h +++ b/examples/ti/ek-tm4c1294xl-baremetal/hal.h @@ -133,22 +133,18 @@ static inline void gpio_irq_attach(uint16_t pin) { #define UARTNO(u) ((uint8_t) (((unsigned int) (u) -UART0_BASE) / UART_OFFSET)) static inline void uart_init(UART0_Type *uart, unsigned long baud) { - struct uarthw { - uint16_t rx, tx; // pins - uint8_t af; // Alternate function - }; - // rx, tx, af for UART0,1,2 - struct uarthw uarthw[3] = {{PIN('A', 0), PIN('A', 1), 1}, - {PIN('B', 0), PIN('B', 1), 1}, - {PIN('A', 6), PIN('A', 7), 1}}; // or PD4, PD5... - + uint8_t af = 1; // Alternate function + uint16_t rx = 0, tx = 0; // pins uint8_t uartno = UARTNO(uart); + SYSCTL->RCGCUART |= BIT(uartno); // Enable peripheral clock - gpio_init(uarthw[uartno].tx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, - GPIO_SPEED_HIGH, 0, uarthw[uartno].af); - gpio_init(uarthw[uartno].rx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, - GPIO_SPEED_HIGH, 0, uarthw[uartno].af); + if (uart == UART0) tx = PIN('A', 0), rx = PIN('A', 1); + if (uart == UART1) tx = PIN('B', 0), rx = PIN('B', 1); + if (uart == UART2) tx = PIN('A', 6), rx = PIN('A', 7); // or PD4, PD5... + + gpio_init(tx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); + gpio_init(rx, GPIO_MODE_AF, GPIO_OTYPE_PUSH_PULL, GPIO_SPEED_HIGH, 0, af); // (16.3.2) ClkDiv = 16 (HSE=0) // BRD = BRDI + BRDF = UARTSysClk / (ClkDiv * Baud Rate) // UARTFBRD[DIVFRAC] = integer(BRDF * 64 + 0.5)