From 81a5aeff7480021dce73d0a75ab0f5e77d8fe8c5 Mon Sep 17 00:00:00 2001
From: Chloe Bethel <chloe@9net.org>
Date: Tue, 7 Oct 2025 12:11:26 +0100
Subject: [PATCH] Fix serial pins for Ebyte E77 MBL board (#8246)

Also move RAK3172 and new EBYTE_E77_MBL define to variant.h, as this makes VSCode know about the defines properly...

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/modules/SerialModule.cpp                  | 2 +-
 variants/stm32/CDEBYTE_E77-MBL/platformio.ini | 5 ++++-
 variants/stm32/CDEBYTE_E77-MBL/variant.h      | 2 ++
 variants/stm32/rak3172/platformio.ini         | 1 -
 variants/stm32/rak3172/variant.h              | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index 7485f1c2d..a9ec8f6a8 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -67,7 +67,7 @@ SerialModuleRadio *serialModuleRadio;
     defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial") {}
 static Print *serialPrint = &Serial;
-#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172)
+#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL)
 SerialModule::SerialModule() : StreamAPI(&Serial1), concurrency::OSThread("Serial") {}
 static Print *serialPrint = &Serial1;
 #else
diff --git a/variants/stm32/CDEBYTE_E77-MBL/platformio.ini b/variants/stm32/CDEBYTE_E77-MBL/platformio.ini
index 290982405..c5af9a4a4 100644
--- a/variants/stm32/CDEBYTE_E77-MBL/platformio.ini
+++ b/variants/stm32/CDEBYTE_E77-MBL/platformio.ini
@@ -6,9 +6,12 @@ board_level = extra
 build_flags =
   ${stm32_base.build_flags}
   -Ivariants/stm32/CDEBYTE_E77-MBL
-  -DSERIAL_UART_INSTANCE=1
+  -DSERIAL_UART_INSTANCE=2
   -DPIN_SERIAL_RX=PA3
   -DPIN_SERIAL_TX=PA2
+  -DENABLE_HWSERIAL1
+  -DPIN_SERIAL1_RX=PB7
+  -DPIN_SERIAL1_TX=PB6
   -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
   -DMESHTASTIC_EXCLUDE_I2C=1
   -DMESHTASTIC_EXCLUDE_GPS=1
diff --git a/variants/stm32/CDEBYTE_E77-MBL/variant.h b/variants/stm32/CDEBYTE_E77-MBL/variant.h
index 317f44489..e3d111a33 100644
--- a/variants/stm32/CDEBYTE_E77-MBL/variant.h
+++ b/variants/stm32/CDEBYTE_E77-MBL/variant.h
@@ -18,4 +18,6 @@ Do not expect a working Meshtastic device with this target.
 #define LED_PIN PB4 // LED1
 // #define LED_PIN PB3 // LED2
 #define LED_STATE_ON 1
+
+#define EBYTE_E77_MBL
 #endif
diff --git a/variants/stm32/rak3172/platformio.ini b/variants/stm32/rak3172/platformio.ini
index 7fc6c7cba..b9a4b8a04 100644
--- a/variants/stm32/rak3172/platformio.ini
+++ b/variants/stm32/rak3172/platformio.ini
@@ -6,7 +6,6 @@ board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 build_flags =
   ${stm32_base.build_flags}
   -Ivariants/stm32/rak3172
-  -DRAK3172
   -DENABLE_HWSERIAL1
   -DPIN_SERIAL1_RX=PB7
   -DPIN_SERIAL1_TX=PB6
diff --git a/variants/stm32/rak3172/variant.h b/variants/stm32/rak3172/variant.h
index 45752b481..30d2b57b4 100644
--- a/variants/stm32/rak3172/variant.h
+++ b/variants/stm32/rak3172/variant.h
@@ -16,4 +16,6 @@ Do not expect a working Meshtastic device with this target.
 #define LED_PIN PA0 // Green LED
 #define LED_STATE_ON 1
 
+#define RAK3172
+
 #endif