From eafbd85d1706698cbc09ca674d49743a9bda4445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Tue, 25 Nov 2025 11:53:21 +0000
Subject: [PATCH 1/2] Add RAK4631 support for rs232 bridge

---
 src/helpers/bridges/RS232Bridge.cpp |  2 ++
 variants/rak4631/platformio.ini     | 44 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/helpers/bridges/RS232Bridge.cpp b/src/helpers/bridges/RS232Bridge.cpp
index 554e8fcc..77332855 100644
--- a/src/helpers/bridges/RS232Bridge.cpp
+++ b/src/helpers/bridges/RS232Bridge.cpp
@@ -15,6 +15,8 @@ void RS232Bridge::begin() {
 
 #if defined(ESP32)
   ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
+#elif defined(RAK_4631) 
+  ((Uart *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(NRF52_PLATFORM)
   ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(RP2040_PLATFORM)
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 7db67abf..37800c06 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -45,6 +45,50 @@ build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
 
+[env:RAK_4631_repeater_bridge_rs232_tx0_rx0]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"RS232 Bridge"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+  -D WITH_RS232_BRIDGE=Serial2
+  -D WITH_RS232_BRIDGE_RX=19
+  -D WITH_RS232_BRIDGE_TX=20
+;  -D BRIDGE_DEBUG=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+;  -D CORE_DEBUG_LEVEL=3
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/bridges/RS232Bridge.cpp>
+  +<../examples/simple_repeater>
+  
+[env:RAK_4631_repeater_bridge_rs232_tx1_rx1]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"RS232 Bridge"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+  -D WITH_RS232_BRIDGE=Serial1
+  -D WITH_RS232_BRIDGE_RX=15
+  -D WITH_RS232_BRIDGE_TX=16
+;  -D BRIDGE_DEBUG=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+;  -D CORE_DEBUG_LEVEL=3
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/bridges/RS232Bridge.cpp>
+  +<../examples/simple_repeater>
+
 [env:RAK_4631_room_server]
 extends = rak4631
 build_flags =

From baedddb25dead095d439ce458ed7439f10ffde44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Tue, 25 Nov 2025 16:19:28 +0000
Subject: [PATCH 2/2] Rename RS232 bridge environments and update build flags
 for Serial1 and Serial2

---
 variants/rak4631/platformio.ini | 51 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 37800c06..b3357855 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -45,29 +45,7 @@ build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
 
-[env:RAK_4631_repeater_bridge_rs232_tx0_rx0]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"RS232 Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_RS232_BRIDGE=Serial2
-  -D WITH_RS232_BRIDGE_RX=19
-  -D WITH_RS232_BRIDGE_TX=20
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-;  -D CORE_DEBUG_LEVEL=3
-build_src_filter = ${rak4631.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/bridges/RS232Bridge.cpp>
-  +<../examples/simple_repeater>
-  
-[env:RAK_4631_repeater_bridge_rs232_tx1_rx1]
+[env:RAK_4631_repeater_bridge_rs232_serial1]
 extends = rak4631
 build_flags =
   ${rak4631.build_flags}
@@ -78,8 +56,31 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
   -D WITH_RS232_BRIDGE=Serial1
-  -D WITH_RS232_BRIDGE_RX=15
-  -D WITH_RS232_BRIDGE_TX=16
+  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX
+  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL1_TX
+  -UENV_INCLUDE_GPS
+;  -D BRIDGE_DEBUG=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+;  -D CORE_DEBUG_LEVEL=3
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/bridges/RS232Bridge.cpp>
+  +<../examples/simple_repeater>
+
+[env:RAK_4631_repeater_bridge_rs232_serial2]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"RS232 Bridge"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=50
+  -D WITH_RS232_BRIDGE=Serial2
+  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL2_RX
+  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL2_TX
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1