Fix CLEAR_ALL_STASH

CommandDistributor.cpp

@@ -280,6 +280,9 @@ void  CommandDistributor::broadcastPower() {
     state = '1';
   }
 
+  if (state != '2')
+    broadcastReply(COMMAND_TYPE, F("<p%c>\n"),state);
+
   // additional info about MAIN, PROG and JOIN
   bool main=TrackManager::getMainPower()==POWERMODE::ON;
   bool prog=TrackManager::getProgPower()==POWERMODE::ON;
@@ -288,7 +291,7 @@ void  CommandDistributor::broadcastPower() {
   const FSH * reason=F("");
   if (join) {
     reason = F(" JOIN"); // with space at start so we can append without space
-    broadcastReply(COMMAND_TYPE, F("<p1 %S>\n"),reason);
+    broadcastReply(COMMAND_TYPE, F("<p1%S>\n"),reason);
   } else {
     if (main) {
       //reason = F("MAIN");
@@ -299,9 +302,6 @@ void  CommandDistributor::broadcastPower() {
       broadcastReply(COMMAND_TYPE, F("<p1 PROG>\n"));
     }
   }
-
-  if (state != '2')
-    broadcastReply(COMMAND_TYPE, F("<p%c>\n"),state);
 #ifdef CD_HANDLE_RING
   // send '1' if all main are on, otherwise global state (which in that case is '0' or '2')
   broadcastReply(WITHROTTLE_TYPE, F("PPA%c\n"), main?'1': state);

DCCEXParser.cpp

@@ -167,8 +167,10 @@ int16_t DCCEXParser::splitValues(int16_t result[MAX_COMMAND_PARAMS], byte *cmd,
                 break;
             if (hot == '\0')
 	      return -1;
-	    if (hot == '>')
+	    if (hot == '>') {
+	      *remainingCmd = '\0';  // terminate the cmd string with 0 instead of '>'
 	      return parameterCount;
+	    }
             state = 2;
             continue;
 
@@ -265,17 +267,22 @@ void DCCEXParser::parse(const FSH * cmd) {
 // See documentation on DCC class for info on this section
 
 void DCCEXParser::parse(Print *stream,  byte *com,  RingStream *ringStream) {
-  // This function can get stings of the form "<C OMM AND>" or "C OMM AND"
-  // found is true first after the leading "<" has been passed
+  // This function can get stings of the form "<C OMM AND>" or "C OMM AND>"
+  // found is true first after the leading "<" has been passed which results
+  // in parseOne() getting c="C OMM AND>"
+  byte *cForLater = NULL;
   bool found = (com[0] != '<');
   for (byte *c=com; c[0] != '\0'; c++) {
     if (found) {
-      parseOne(stream, c,  ringStream);
+      cForLater = c;
       found=false;
     }
-    if (c[0] == '<')
+    if (c[0] == '<') {
+      if (cForLater) parseOne(stream, cForLater, ringStream);
       found = true;
+    }
   }
+  if (cForLater) parseOne(stream, cForLater, ringStream);
 }
 
 void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)

DCCTimerESP.cpp

@@ -78,11 +78,17 @@ int DCCTimer::freeMemory() {
 ////////////////////////////////////////////////////////////////////////
 #ifdef ARDUINO_ARCH_ESP32
 
+#if __has_include("esp_idf_version.h")
 #include "esp_idf_version.h"
-#if ESP_IDF_VERSION_MAJOR > 4
+#endif
+#if ESP_IDF_VERSION_MAJOR == 4
+// all well correct IDF version
+#else
 #error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDF version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
 #endif
 
+// protect all the rest of the code from IDF version 5
+#if ESP_IDF_VERSION_MAJOR == 4
 #include "DIAG.h"
 #include <driver/adc.h>
 #include <soc/sens_reg.h>
@@ -322,5 +328,5 @@ void ADCee::scan() {
 
 void ADCee::begin() {
 }
-
+#endif //IDF v4
 #endif //ESP32

EXRAIL2.cpp

@@ -931,8 +931,9 @@ void RMFT2::loop2() {
 
 #ifndef DISABLE_PROG
   case OPCODE_JOIN:
-    TrackManager::setPower(POWERMODE::ON);
     TrackManager::setJoin(true);
+    TrackManager::setMainPower(POWERMODE::ON);
+    TrackManager::setProgPower(POWERMODE::ON);
     break;
 
   case OPCODE_UNJOIN:

EXRAIL2MacroReset.h

@@ -217,7 +217,7 @@
 #define BROADCAST(msg)
 #define CALL(route)
 #define CLEAR_STASH(id)
-#define CLEAR_ALL_STASH(id)
+#define CLEAR_ALL_STASH
 #define CLOSE(id)
 #define CONFIGURE_SERVO(vpin,pos1,pos2,profile) 
 #define DCC_SIGNAL(id,add,subaddr)

SerialManager.cpp

@@ -126,29 +126,33 @@ void SerialManager::loop2() {
         buffer[0] = '\0';
       }
     } else { // if (inCommandPayload)
-      if (bufferLength <  (COMMAND_BUFFER_SIZE-1))
-        buffer[bufferLength++] = ch;
-      if (inCommandPayload > PAYLOAD_NORMAL) {
-        if (inCommandPayload > 32 + 2) {    // String way too long
-          ch = '>';                         // we end this nonsense
-          inCommandPayload = PAYLOAD_NORMAL;
-          DIAG(F("Parse error: Unbalanced string"));
-          // fall through to ending parsing below
-        } else if (ch == '"') {               // String end
-          inCommandPayload = PAYLOAD_NORMAL;
-          continue; // do not fall through
-        } else
-          inCommandPayload++;
-      }
-      if (inCommandPayload == PAYLOAD_NORMAL) {
-        if (ch == '>') {
-          buffer[bufferLength] = '\0';
-          DCCEXParser::parse(serial, buffer, NULL); 
-          inCommandPayload = PAYLOAD_FALSE;
-          break;
-        } else if (ch == '"') {
-          inCommandPayload = PAYLOAD_STRING;
-        }
+      if (bufferLength <  (COMMAND_BUFFER_SIZE-1)) {
+        buffer[bufferLength++] = ch;          // advance bufferLength
+	if (inCommandPayload > PAYLOAD_NORMAL) {
+	  if (inCommandPayload > 32 + 2) {    // String way too long
+	    ch = '>';                         // we end this nonsense
+	    inCommandPayload = PAYLOAD_NORMAL;
+	    DIAG(F("Parse error: Unbalanced string"));
+	    // fall through to ending parsing below
+	  } else if (ch == '"') {               // String end
+	    inCommandPayload = PAYLOAD_NORMAL;
+	    continue; // do not fall through
+	  } else
+	    inCommandPayload++;
+	}
+	if (inCommandPayload == PAYLOAD_NORMAL) {
+	  if (ch == '>') {
+	    buffer[bufferLength] = '\0';               // This \0 is after the '>'
+	    DCCEXParser::parse(serial, buffer, NULL);  // buffer parsed with trailing '>'
+	    inCommandPayload = PAYLOAD_FALSE;
+	    break;
+	  } else if (ch == '"') {
+	    inCommandPayload = PAYLOAD_STRING;
+	  }
+	}
+      } else {
+	DIAG(F("Parse error: input buffer overflow"));
+	inCommandPayload = PAYLOAD_FALSE;
       }
     }
   }

TrackManager.cpp

@@ -668,7 +668,8 @@ void TrackManager::setJoin(bool joined) {
       if (track[t]->getMode() & TRACK_MODE_PROG) {       // find PROG track
 	tempProgTrack = t;                               // remember PROG track
 	setTrackMode(t, TRACK_MODE_MAIN);
-	track[t]->setPower(POWERMODE::ON);               // if joined, always on
+	// setPower() of the track called after
+	// seperately after setJoin() instead
 	break;                                           // there is only one prog track, done
       }
     }
@@ -680,8 +681,6 @@ void TrackManager::setJoin(bool joined) {
       setTrackMode(tempProgTrack, TRACK_MODE_PROG);         // set track mode back to prog
       track[tempProgTrack]->setPower(tPTmode);              // set power status as it was before
       tempProgTrack = MAX_TRACKS+1;
-    } else {
-      DIAG(F("Unjoin but no remembered prog track"));
     }
   }
 #endif

WiThrottle.cpp

@@ -500,9 +500,9 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
   char addcmd[20]={'M',stashThrottleChar,'+', addrchar};
   itoa(locoid,addcmd+4,10);
   stashInstance->multithrottle(stashStream, (byte *)addcmd);
+  TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
   TrackManager::setMainPower(POWERMODE::ON);
   TrackManager::setProgPower(POWERMODE::ON);
-  TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
   DIAG(F("LocoCallback commit success"));
   stashStream->commit();
 }

version.h

@@ -3,7 +3,12 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.4.3"
+#define VERSION "5.4.7"
+// 5.4.7  - Bugfix: EXRAIL fix CLEAR_ALL_STASH
+// 5.4.6  - Bugfix: Do not drop further commands in same packet
+// 5.4.5  - ESP32: Better detection of correct IDF version
+//        - track power is always turned on after setJoin() not by setJoin()
+// 5.4.4  - bugfix in parser, input buffer overrun and trailing > that did break <+>
 // 5.4.3  - bugfix changeFn for functions 29..31
 // 5.4.2  - Reversed turnout bugfix
 // 5.4.1  - ESP32 bugfix packet buffer race