Handle boards with 2 Serial (0 and 1)

mathieucarbou · Sep 6, 2024 · e78dde8 · e78dde8
1 parent 5e7d930
commit e78dde8
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 1 deletion.
diff --git a/examples/Callback/Callback.ino b/examples/Callback/Callback.ino
@@ -1,6 +1,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 // Pin: RX (ESP32) -> TX (JSY)
 #define JSY_TX_PIN 16
 

diff --git a/examples/CallbackAsync/CallbackAsync.ino b/examples/CallbackAsync/CallbackAsync.ino
@@ -2,6 +2,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 // Pin: Relay  (ESP32)
 #define RELAY_PIN 26
 // #define RELAY_PIN 32

diff --git a/examples/EnergyReset/EnergyReset.ino b/examples/EnergyReset/EnergyReset.ino
@@ -3,6 +3,13 @@
 #include <HardwareSerial.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSY jsy;
 
 void setup() {

diff --git a/examples/EnergyResetAsync/EnergyResetAsync.ino b/examples/EnergyResetAsync/EnergyResetAsync.ino
@@ -3,6 +3,13 @@
 #include <HardwareSerial.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSY jsy;
 
 void setup() {

diff --git a/examples/PerfTest1/PerfTest1.ino b/examples/PerfTest1/PerfTest1.ino
@@ -1,6 +1,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 // Pin: RX (ESP32) -> TX (JSY)
 #define JSY_TX_PIN 16
 

diff --git a/examples/PerfTest2/PerfTest2.ino b/examples/PerfTest2/PerfTest2.ino
@@ -1,6 +1,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 // Pin: RX (ESP32) -> TX (JSY)
 #define JSY_TX_PIN 16
 

diff --git a/examples/Read/Read.ino b/examples/Read/Read.ino
@@ -2,6 +2,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSY jsy;
 
 void setup() {

diff --git a/examples/ReadAsync/ReadAsync.ino b/examples/ReadAsync/ReadAsync.ino
@@ -2,6 +2,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSY jsy;
 
 void setup() {

diff --git a/examples/Repair/Repair.ino b/examples/Repair/Repair.ino
@@ -3,6 +3,13 @@
 #include <HardwareSerial.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 void setup() {
   Serial.begin(115200);
   while (!Serial)

diff --git a/examples/SetSpeed/SetSpeed.ino b/examples/SetSpeed/SetSpeed.ino
@@ -2,6 +2,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSYBaudRate target = Mycila::JSYBaudRate::BAUD_38400;
 
 Mycila::JSY jsy;

diff --git a/examples/SetSpeed2/SetSpeed2.ino b/examples/SetSpeed2/SetSpeed2.ino
@@ -2,6 +2,13 @@
 #include <ArduinoJson.h>
 #include <MycilaJSY.h>
 
+#ifndef SOC_UART_HP_NUM
+  #define SOC_UART_HP_NUM SOC_UART_NUM
+#endif
+#if SOC_UART_HP_NUM < 3
+  #define Serial2 Serial1
+#endif
+
 Mycila::JSY jsy;
 
 void setup() {

diff --git a/src/MycilaJSY.cpp b/src/MycilaJSY.cpp
@@ -728,7 +728,7 @@ Mycila::JSY::ReadResult Mycila::JSY::_timedRead(uint8_t* buffer, const size_t ex
 
   size_t count = 0;
   while (count < expectedLength) {
-    size_t read = Serial2.readBytes(buffer + count, expectedLength - count);
+    size_t read = _serial->readBytes(buffer + count, expectedLength - count);
     if (read) {
       count += read;
     } else {