DCCEXParser.cpp

@@ -451,16 +451,12 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 
 #ifndef DISABLE_PROG
     case 'w': // WRITE CV on MAIN <w CAB CV VALUE>
-      if (params != 3)
+        DCC::writeCVByteMain(p[0], p[1], p[2]);
-	break;
+        return;
-      DCC::writeCVByteMain(p[0], p[1], p[2]);
-      return;
 
     case 'b': // WRITE CV BIT ON MAIN <b CAB CV BIT VALUE>
-      if (params != 4)
+        DCC::writeCVBitMain(p[0], p[1], p[2], p[3]);
-	break;
+        return;
-      DCC::writeCVBitMain(p[0], p[1], p[2], p[3]);
-      return;
 #endif
 
     case 'M': // WRITE TRANSPARENT DCC PACKET MAIN <M REG X1 ... X9>
@@ -483,16 +479,14 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         
 #ifndef DISABLE_PROG
     case 'W': // WRITE CV ON PROG <W CV VALUE CALLBACKNUM CALLBACKSUB>
-        if (!stashCallback(stream, p, ringStream))
+            if (!stashCallback(stream, p, ringStream))
-	    break;
+                break;
         if (params == 1) // <W id> Write new loco id (clearing consist and managing short/long)
             DCC::setLocoId(p[0],callback_Wloco);
         else if (params == 4)  // WRITE CV ON PROG <W CV VALUE [CALLBACKNUM] [CALLBACKSUB]>
             DCC::writeCVByte(p[0], p[1], callback_W4);
-        else if (params == 2)  // WRITE CV ON PROG <W CV VALUE>
+        else  // WRITE CV ON PROG <W CV VALUE>
             DCC::writeCVByte(p[0], p[1], callback_W);
-	else
-            break;
         return;
 
     case 'V': // VERIFY CV ON PROG <V CV VALUE> <V CV BIT 0|1>
@@ -512,11 +506,9 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         }
         break;
 
-    case 'B': // WRITE CV BIT ON PROG  <B CV BIT VALUE CALLBACKNUM CALLBACKSUB> or <B CV BIT VALUE>
+    case 'B': // WRITE CV BIT ON PROG <B CV BIT VALUE CALLBACKNUM CALLBACKSUB>
-        if (params != 3 && params != 5)
-	  break;
         if (!stashCallback(stream, p, ringStream))
-	  break;
+            break;
         DCC::writeCVBit(p[0], p[1], p[2], callback_B);
         return;
 
@@ -646,12 +638,12 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
     case ' ': // < >
         StringFormatter::send(stream, F("\n"));
         return;
-#ifndef DISABLE_DIAG
+
     case 'D': // < >
         if (parseD(stream, params, p))
             return;
-        break;
+        return;
-#endif
+
     case '=': // <= Track manager control  >
         if (TrackManager::parseJ(stream, params, p))
             return;

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202308302157Z"
+#define GITHUB_SHA "devel-202308251713Z"

IODevice.h

@@ -29,13 +29,8 @@
 
 // Define symbol IO_NO_HAL to reduce FLASH footprint when HAL features not required
 // The HAL is disabled by default on Nano and Uno platforms, because of limited flash space.
-#include "defines.h"
 #if defined(ARDUINO_AVR_NANO) || defined(ARDUINO_AVR_UNO) 
-  #if defined(DISABLE_DIAG) && defined(DISABLE_EEPROM) && defined(DISABLE_PROG)
+#define IO_NO_HAL
-    #warning you have sacrificed DIAG for HAL
-  #else
-    #define IO_NO_HAL
-  #endif
 #endif
 
 // Define symbol IO_SWITCH_OFF_SERVO to set the PCA9685 output to 0 when an 

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.1.3"
+#define VERSION "5.1.2"
-// 5.1.3  - Make parser more fool proof
 // 5.1.2  - Bugfix: ESP32 30ms off time
 // 5.1.1  - Check bad AT firmware version
 //        - Update IO_PCA9555.h reflecting IO_MCP23017.h changes to support PCA9548 mux