Merge 50bf1789f7 into 27dc8059d7

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){

EXRAIL2.cpp

@@ -478,15 +478,10 @@ bool RMFT2::skipIfBlock() {
 
 
 /* static */ void RMFT2::readLocoCallback(int16_t cv) {
-  if (cv <= 0) {
-    DIAG(F("CV read error"));
-    progtrackLocoId = -1;
-    return;
-  }
   if (cv & LONG_ADDR_MARKER) {               // maker bit indicates long addr
     progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
     if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) {     // out of range for long addr
-      DIAG(F("Long addr %d <= %d unsupported"), progtrackLocoId, HIGHEST_SHORT_ADDR);
+      DIAG(F("Long addr %d <= %d unsupported\n"), progtrackLocoId, HIGHEST_SHORT_ADDR);
       progtrackLocoId = -1;
     }
   } else {
@@ -926,10 +921,11 @@ void RMFT2::loop2() {
       delayMe(100);
       return; // still waiting for callback
     }
+    if (progtrackLocoId<0) {
+      kill(F("No Loco Found"),progtrackLocoId);
+      return; // still waiting for callback
+    }
     
-    // At failed read will result in loco == -1
-    // which is intended so it can be checked
-    // from within EXRAIL
     loco=progtrackLocoId;
     speedo=0;
     forward=true;

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202409121220Z"
+#define GITHUB_SHA "devel-202406182019Z"

MotorDriver.cpp

@@ -1,6 +1,5 @@
 /*
  *  © 2022-2024 Paul M Antoine
- *  © 2024 Herb Morton
  *  © 2021 Mike S
  *  © 2021 Fred Decker
  *  © 2020-2023 Harald Barth
@@ -99,7 +98,7 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
   if (HAVE_PORTH(fastSignalPin.inout == &PORTH)) {
     DIAG(F("Found PORTH pin %d"),signalPin);
     fastSignalPin.shadowinout = fastSignalPin.inout;
-    fastSignalPin.inout = &shadowPORTH;
+    fastSignalPin.inout = &shadowPORTF;
   }
 
   signalPin2=signal_pin2;

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,11 +88,7 @@ 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
-#else
-  Serial2.begin(9600);
-#endif
 #endif
 }
 

TrackManager.cpp

@@ -1,8 +1,6 @@
 /*
  *  © 2022 Chris Harlow
  *  © 2022-2024 Harald Barth
- *  © 2023-2024 Paul M. Antoine
- *  © 2024 Herb Morton
  *  © 2023 Colin Murdoch
  *  All rights reserved.
  *  
@@ -151,8 +149,6 @@ void TrackManager::setDCCSignal( bool on) {
   HAVE_PORTD(shadowPORTD=PORTD);
   HAVE_PORTE(shadowPORTE=PORTE);
   HAVE_PORTF(shadowPORTF=PORTF);
-  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTF=PORTH);
   APPLY_BY_MODE(TRACK_MODE_MAIN,setSignal(on));
   HAVE_PORTA(PORTA=shadowPORTA);
   HAVE_PORTB(PORTB=shadowPORTB);
@@ -160,8 +156,6 @@ void TrackManager::setDCCSignal( bool on) {
   HAVE_PORTD(PORTD=shadowPORTD);
   HAVE_PORTE(PORTE=shadowPORTE);
   HAVE_PORTF(PORTF=shadowPORTF);
-  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTF=PORTH);
 }
 
 // setPROGSignal(), called from interrupt context
@@ -173,8 +167,6 @@ void TrackManager::setPROGSignal( bool on) {
   HAVE_PORTD(shadowPORTD=PORTD);
   HAVE_PORTE(shadowPORTE=PORTE);
   HAVE_PORTF(shadowPORTF=PORTF);
-  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTF=PORTH);
   APPLY_BY_MODE(TRACK_MODE_PROG,setSignal(on));
   HAVE_PORTA(PORTA=shadowPORTA);
   HAVE_PORTB(PORTB=shadowPORTB);
@@ -182,8 +174,6 @@ void TrackManager::setPROGSignal( bool on) {
   HAVE_PORTD(PORTD=shadowPORTD);
   HAVE_PORTE(PORTE=shadowPORTE);
   HAVE_PORTF(PORTF=shadowPORTF);
-  HAVE_PORTG(shadowPORTF=PORTG);
-  HAVE_PORTH(shadowPORTF=PORTH);
 }
 
 // setDCSignal(), called from normal context
@@ -641,25 +631,23 @@ void TrackManager::setJoinRelayPin(byte joinRelayPin) {
 
 void TrackManager::setJoin(bool joined) {
 #ifdef ARDUINO_ARCH_ESP32
-  if (joined) {                                          // if we go into joined mode (PROG acts as MAIN)
+  if (joined) {
     FOR_EACH_TRACK(t) {
-      if (track[t]->getMode() & TRACK_MODE_PROG) {       // find PROG track
-	tempProgTrack = t;                               // remember PROG track
+      if (track[t]->getMode() & TRACK_MODE_PROG) {
+	tempProgTrack = t;
 	setTrackMode(t, TRACK_MODE_MAIN);
-	track[t]->setPower(POWERMODE::ON);               // if joined, always on
-	break;                                           // there is only one prog track, done
+	break;
       }
     }
   } else {
     if (tempProgTrack != MAX_TRACKS+1) {
-      // setTrackMode defaults to power off, so we
-      // need to preserve that state.
-      POWERMODE tPTmode = track[tempProgTrack]->getPower(); // get current power status of this track
-      setTrackMode(tempProgTrack, TRACK_MODE_PROG);         // set track mode back to prog
-      track[tempProgTrack]->setPower(tPTmode);              // set power status as it was before
+      // as setTrackMode with TRACK_MODE_PROG defaults to
+      // power off, we will take the current power state
+      // of our track and then preserve that state.
+      POWERMODE tPTmode = track[tempProgTrack]->getPower(); //get current power status of this track
+      setTrackMode(tempProgTrack, TRACK_MODE_PROG);
+      track[tempProgTrack]->setPower(tPTmode);              //set track status as it was before
       tempProgTrack = MAX_TRACKS+1;
-    } else {
-      DIAG(F("Unjoin but no remembered prog track"));
     }
   }
 #endif

WiThrottle.cpp

@@ -322,15 +322,6 @@ void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar,
       }
       break;  
     }
-  case 'f': // Function key set, force function variant
-    {
-      bool pressed=aval[1]=='1';
-      int fKey = getInt(aval+2);
-      LOOPLOCOS(throttleChar, cab) {
-	DCC::setFn(myLocos[loco].cab,fKey, pressed);
-      }
-      break;
-    }
   case 'q':
     if (aval[1]=='V' || aval[1]=='R' ) {   //qV or qR
       // just flag the loco for broadcast and it will happen.

WifiESP32.cpp

@@ -265,7 +265,7 @@ bool WifiESP::setup(const char *SSid,
   if(!MDNS.begin(hostname)) {
     DIAG(F("Wifi setup failed to start mDNS"));
   }
-  if(!MDNS.addService("withrottle", "tcp", port)) {
+  if(!MDNS.addService("withrottle", "tcp", 2560)) {
     DIAG(F("Wifi setup failed to add withrottle service to mDNS"));
   }
 

version.h

@@ -3,13 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.77"
-// 5.2.77 - Withrottle: Implement "force function" subcommand "f"
-// 5.2.76 - Bugfix: EXRAIL: Catch CV read errors in the callback
-// 5.2.75 - Bugfix: Serial lines 4 to 6 OK
-// 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
+#define VERSION "5.2.71"
 // 5.2.71 -  Broadcasts of loco forgets. 
 // 5.2.70 -  IO_RocoDriver renamed to IO_EncoderThrottle.
 //        -  and included in IODEvice.h (circular dependency removed)