DCCEXParser.cpp

@@ -1117,21 +1117,6 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         return true;
 
 #ifdef HAS_ENOUGH_MEMORY
-#ifdef Z21_PROTOCOL
-    case "Z21THROTTLE"_hk: // <D Z21THROTTLE ON/OFF>
-    case "Z21THR"_hk:      // <D Z21THR ON/OFF>
-      Diag::Z21THROTTLE = onOff;
-      return true;
-    case "Z21THROTTLEVERBOSE"_hk: // <D Z21THROTTLEVERBOSE ON/OFF>
-    case "Z21THRV"_hk:            // <D Z21THV ON/OFF>
-      Diag::Z21THROTTLEVERBOSE = onOff;
-      return true;
-    case "Z21THROTTLEDATA"_hk: // <D Z21THROTTLEDATA ON/OFF>
-    case "Z21THRD"_hk:         // <D Z21THD ON/OFF>
-      Diag::Z21THROTTLEDATA = onOff;
-      return true;
-#endif // Z21_PROTOCOL
-
     case "WIFI"_hk: // <D WIFI ON/OFF>
         Diag::WIFI = onOff;
         return true;

DCCWaveform.cpp

@@ -294,7 +294,7 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   // The resets will be zero not only now but as well repeats packets into the future
   clearResets(repeats+1);
   {
-    int ret = 0;
+    int ret;
     do {
       if(isMainTrack) {
 	if (rmtMainChannel != NULL)

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-z21-202404012202Z"
+#define GITHUB_SHA "devel-z21-202404011058Z"

NetworkClientUDP.h

@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifdef Z21_PROTOCOL
 #include <WiFi.h>
 #include <WiFiClient.h>
 
@@ -36,4 +35,3 @@ public:
   
   static WiFiUDP client;
 };
-#endif

StringFormatter.cpp

@@ -25,9 +25,9 @@ bool Diag::ACK=false;
 bool Diag::CMD=false;
 bool Diag::WIFI=false;
 bool Diag::WITHROTTLE=false;
-bool Diag::Z21THROTTLE=false;
+bool Diag::Z21THROTTLE=true;
-bool Diag::Z21THROTTLEVERBOSE=false;
+bool Diag::Z21THROTTLEVERBOSE=true;
-bool Diag::Z21THROTTLEDATA=false;
+bool Diag::Z21THROTTLEDATA=true;
 bool Diag::ETHERNET=false;
 bool Diag::LCN=false;
 

Turnouts.cpp

@@ -123,6 +123,7 @@
     return true;
   }
 
+#define DIAG_IO
   // Static setClosed function is invoked from close(), throw() etc. to perform the 
   //  common parts of the turnout operation.  Code which is specific to a turnout
   //  type should be placed in the virtual function setClosedInternal(bool) which is

Z21Throttle.cpp

@@ -707,43 +707,27 @@ bool Z21Throttle::parse(byte *networkPacket, int len) {
 
     int lengthData = GETINT16(p);
     l -= lengthData;
-
+    if (p == networkPacket && lengthData != len) {
-    // This is not an error, just several X bus packets in one UDP packet
+      diagPacket(networkPacket, len);
-    if (Diag::Z21THROTTLEDATA) // only care if diag is on
+    }
-      if (p == networkPacket && lengthData != len) {
-	diagPacket(networkPacket, len);
-      }
-
-    // This is a client error, report always
     if (l < 0) {
       DIAG(F("ERROR: Xbus data exceeds UDP packet size: l < 0 pos=%d, l=%d"), p-networkPacket, l);
       diagPacket(p, len);
       return false;
     }
-
-    // This is kinda client error but not harmful
-    // Report if diag and we are done with parsing this UDP packet
     if (l > 0 && lengthData < 4) {
-      // The client did send a too long UDP packet which was not filled with X bus packet(s)
+      DIAG(F("WARNING: Xbus data does not fill UDP packet size: l > 0 pos=%d, l=%d, lengthData=%d"),
-      // The Z21 App does this sometimes
+	   p-networkPacket, l, lengthData);
-      if (Diag::Z21THROTTLEDATA) {
+      diagPacket(p, len);
-	DIAG(F("WARNING: Xbus data does not fill UDP packet size: l > 0 pos=%d, l=%d, lengthData=%d"),
-	     p-networkPacket, l, lengthData);
-	diagPacket(p, len);
-      }
       return true;
     }
-
     // length of the data = total length - length of length (!) - length of header
-    // Error, this should not happen
     lengthData -= 4;
     if (lengthData < 0) {
       DIAG(F("ERROR: lengthData < 0 SHOULD NOT GET HERE"));
       diagPacket(networkPacket, len);
       return false;
     }
-
-    // All checks done, start looking at packet content
     p += 2;
     Header = GETINT16(p);
     p += 2;

version.h

@@ -4,7 +4,6 @@
 #include "StringFormatter.h"
 
 #define VERSION "5.X.Y"
-//          Make Z21 diag selectable from DCCEXParser
 //          Z21 error fix for turnout feedback
 //          Z21 add turnout and sensor broadcasts
 //          Z21: report the (unchanged) loco mode back after every attempted change