CommandDistributor.cpp

@@ -37,7 +37,7 @@ int16_t lastclocktime;
 int8_t lastclockrate;
 
 
-#if WIFI_ON || ETHERNET_ON || defined(SERIAL1_COMMANDS) || defined(SERIAL2_COMMANDS) || defined(SERIAL3_COMMANDS) || defined(SERIAL4_COMMANDS) || defined(SERIAL5_COMMANDS) || defined(SERIAL6_COMMANDS)
+#if WIFI_ON || ETHERNET_ON || defined(SERIAL1_COMMANDS) || defined(SERIAL2_COMMANDS) || defined(SERIAL3_COMMANDS)
 // use a buffer to allow broadcast
 StringBuffer * CommandDistributor::broadcastBufferWriter=new StringBuffer();
 template<typename... Targs> void CommandDistributor::broadcastReply(clientType type, Targs... msg){

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202408291145Z"
+#define GITHUB_SHA "devel-202408080849Z"

SerialManager.cpp

@@ -68,11 +68,7 @@ void SerialManager::init() {
   new SerialManager(&Serial3);
 #endif
 #ifdef SERIAL2_COMMANDS
-#ifdef ARDUINO_ARCH_ESP32
-  Serial2.begin(115200, SERIAL_8N1, 16, 17); // GPIO 16 RXD2; GPIO 17 TXD2 on ESP32
-#else  // not ESP32
   Serial2.begin(115200);
-#endif // ESP32
   new SerialManager(&Serial2);
 #endif
 #ifdef SERIAL1_COMMANDS
@@ -92,10 +88,8 @@ void SerialManager::init() {
   }
 #endif
 #ifdef SABERTOOTH
-#ifdef ARDUINO_ARCH_ESP32
   Serial2.begin(9600, SERIAL_8N1, 16, 17); // GPIO 16 RXD2; GPIO 17 TXD2 on ESP32
 #endif
-#endif
 }
 
 void SerialManager::broadcast(char * stringBuffer) {

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.75"
-// 5.2.75 - Bugfix: Serial lines 4 to 6 OK
+#define VERSION "5.2.74"
 // 5.2.74 - Bugfix: ESP32 turn on the joined prog (as main) again after a prog operation
 // 5.2.73 - Bugfix: STM32 further fixes to shadowPORT entries in TrackManager.cpp for PORTG and PORTH
 // 5.2.72 - Bugfix: added shadowPORT entries in TrackManager.cpp for PORTG and PORTH on STM32, fixed typo in MotorDriver.cpp