From 0ec65dcbf7c6271ed92693c3e7e677f0256ef555 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 15 Jul 2017 16:32:07 -0400 Subject: [PATCH 1/2] Adding support for USART1 LCD to STM32duino --- SerialArduino.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SerialArduino.cpp b/SerialArduino.cpp index 5aab5e8..af23141 100644 --- a/SerialArduino.cpp +++ b/SerialArduino.cpp @@ -37,6 +37,8 @@ void CSerialPort::beginInt(uint8_t n, int speed) case 3U: #if defined(SERIAL_REPEATER) && defined(__STM32F1__) Serial2.begin(speed); + #elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__) + Serial1.begin(speed); #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) Serial1.begin(speed); #endif @@ -58,6 +60,8 @@ int CSerialPort::availableInt(uint8_t n) case 3U: #if defined(SERIAL_REPEATER) && defined(__STM32F1__) return Serial2.available(); + #elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__) + return Serial1.available(); #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) return Serial1.available(); #endif @@ -78,6 +82,8 @@ uint8_t CSerialPort::readInt(uint8_t n) case 3U: #if defined(SERIAL_REPEATER) && defined(__STM32F1__) return Serial2.read(); + #elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__) + return Serial1.read(); #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) return Serial1.read(); #endif @@ -101,6 +107,8 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool case 3U: #if defined(SERIAL_REPEATER) && defined(__STM32F1__) Serial2.write(data, length); + #elif defined(SERIAL_REPEATER_USART1) && defined(__STM32F1__) + Serial1.write(data, length); #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)) Serial1.write(data, length); #endif From 3ea4d243d6ddde79f431b39622e779e8fb760896 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Sat, 15 Jul 2017 16:32:43 -0400 Subject: [PATCH 2/2] Support for USART1 LCD to SerialPort.cpp --- SerialPort.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SerialPort.cpp b/SerialPort.cpp index 9acfc52..9e4410c 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -356,7 +356,7 @@ void CSerialPort::start() { beginInt(1U, 115200); -#if defined(SERIAL_REPEATER) +#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1) beginInt(3U, 9600); #endif } @@ -536,7 +536,7 @@ void CSerialPort::process() } break; -#if defined(SERIAL_REPEATER) +#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1) case MMDVM_SERIAL: writeInt(3U, m_buffer + 3U, m_len - 3U); break; @@ -554,7 +554,7 @@ void CSerialPort::process() } } -#if defined(SERIAL_REPEATER) +#if defined(SERIAL_REPEATER) || defined(SERIAL_REPEATER_USART1) // Drain any incoming serial data while (availableInt(3U)) readInt(3U);