From aa7c7b7bd9b843a0cba2ebbaef158a48f1570569 Mon Sep 17 00:00:00 2001 From: Kenneth Bell Date: Thu, 18 Mar 2021 19:24:59 -0700 Subject: [PATCH] lgt92: update to new UART structure --- src/machine/board_lgt92.go | 14 ++++++++------ src/machine/machine_stm32l0.go | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/machine/board_lgt92.go b/src/machine/board_lgt92.go index 29376df1..ee6129b7 100644 --- a/src/machine/board_lgt92.go +++ b/src/machine/board_lgt92.go @@ -54,16 +54,18 @@ var ( // Console UART (LPUSART1) UART0 = UART{ - Buffer: NewRingBuffer(), - Bus: stm32.LPUART1, - AltFuncSelector: 6, + Buffer: NewRingBuffer(), + Bus: stm32.LPUART1, + TxAltFuncSelector: 6, + RxAltFuncSelector: 6, } // Gps UART UART1 = UART{ - Buffer: NewRingBuffer(), - Bus: stm32.USART1, - AltFuncSelector: 0, + Buffer: NewRingBuffer(), + Bus: stm32.USART1, + TxAltFuncSelector: 0, + RxAltFuncSelector: 0, } // SPI diff --git a/src/machine/machine_stm32l0.go b/src/machine/machine_stm32l0.go index f5a8fb4b..c37d6a02 100644 --- a/src/machine/machine_stm32l0.go +++ b/src/machine/machine_stm32l0.go @@ -191,8 +191,8 @@ func enableAltFuncClock(bus unsafe.Pointer) { // Configure the UART. func (uart UART) configurePins(config UARTConfig) { // enable the alternate functions on the TX and RX pins - config.TX.ConfigureAltFunc(PinConfig{Mode: PinModeUARTTX}, uart.AltFuncSelector) - config.RX.ConfigureAltFunc(PinConfig{Mode: PinModeUARTRX}, uart.AltFuncSelector) + config.TX.ConfigureAltFunc(PinConfig{Mode: PinModeUARTTX}, uart.TxAltFuncSelector) + config.RX.ConfigureAltFunc(PinConfig{Mode: PinModeUARTRX}, uart.RxAltFuncSelector) } // UART baudrate calc based on the bus and clockspeed