Merge 04f0f56348 into 27a5f76a8d

DCCEXParser.cpp

@@ -49,7 +49,7 @@ Once a new OPCODE is decided upon, update this list.
   b, Write CV bit on main
   B, Write CV bit
   c, Request current command
-  C, configure the CS
+  C,
   d,
   D, Diagnostic commands
   e, Erase EEPROM
@@ -693,7 +693,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         Sensor::printAll(stream);
         return;
 
-    case 's': // STATUS <s>
+    case 's': // <s>
         StringFormatter::send(stream, F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), DCC::getMotorShieldName(), F(GITHUB_SHA));
         CommandDistributor::broadcastPower(); // <s> is the only "get power status" command we have
         Turnout::printAll(stream); //send all Turnout states
@@ -714,17 +714,13 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
     case ' ': // < >
         StringFormatter::send(stream, F("\n"));
         return;
-    case 'C': // CONFIG <C [params]>
-        if (parseC(stream, params, p))
-            return;
-        break;
 #ifndef DISABLE_DIAG
-    case 'D': // DIAG <D [params]>
+    case 'D': // < >
         if (parseD(stream, params, p))
             return;
         break;
 #endif
-    case '=': // TACK MANAGER CONTROL <= [params]>
+    case '=': // <= Track manager control  >
         if (TrackManager::parseJ(stream, params, p))
             return;
         break;
@@ -1118,28 +1114,19 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
     return false;
 }
 
-bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
+bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
+{
     if (params == 0)
         return false;
     bool onOff = (params > 0) && (p[1] == 1 || p[1] == HASH_KEYWORD_ON); // dont care if other stuff or missing... just means off
     switch (p[0])
     {
-#ifndef DISABLE_PROG
+    case HASH_KEYWORD_CABS: // <D CABS>
-    case HASH_KEYWORD_PROGBOOST:
+        DCC::displayCabList(stream);
-        TrackManager::progTrackBoosted=true;
-	    return true;
-#endif
-    case HASH_KEYWORD_RESET:
-        DCCTimer::reset();
-        break; // and <X> if we didnt restart
-    case HASH_KEYWORD_SPEED28:
-        DCC::setGlobalSpeedsteps(28);
-	DIAG(F("28 Speedsteps"));
         return true;
 
-    case HASH_KEYWORD_SPEED128:
+    case HASH_KEYWORD_RAM: // <D RAM>
-        DCC::setGlobalSpeedsteps(128);
+        StringFormatter::send(stream, F("Free memory=%d\n"), DCCTimer::getMinimumFreeMemory());
-	DIAG(F("128 Speedsteps"));
         return true;
 
 #ifndef DISABLE_PROG
@@ -1159,33 +1146,12 @@ bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
 	      LCD(0, F("Ack Retry=%d Sum=%d"), p[2], DCCACK::setAckRetry(p[2]));  //   <D ACK RETRY 2>
 	    }
 	} else {
-	  DIAG(F("Ack diag %S"), onOff ? F("on") : F("off"));
+	  StringFormatter::send(stream, F("Ack diag %S\n"), onOff ? F("on") : F("off"));
 	  Diag::ACK = onOff;
 	}
         return true;
 #endif
 
-default: // invalid/unknown
-      break;
-    }
-    return false;
-}
-
-bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
-{
-    if (params == 0)
-        return false;
-    bool onOff = (params > 0) && (p[1] == 1 || p[1] == HASH_KEYWORD_ON); // dont care if other stuff or missing... just means off
-    switch (p[0])
-    {
-    case HASH_KEYWORD_CABS: // <D CABS>
-        DCC::displayCabList(stream);
-        return true;
-
-    case HASH_KEYWORD_RAM: // <D RAM>
-        DIAG(F("Free memory=%d"), DCCTimer::getMinimumFreeMemory());
-        return true;
-
     case HASH_KEYWORD_CMD: // <D CMD ON/OFF>
         Diag::CMD = onOff;
         return true;
@@ -1207,14 +1173,34 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         Diag::LCN = onOff;
         return true;
 #endif
+#ifndef DISABLE_PROG
+    case HASH_KEYWORD_PROGBOOST:
+        TrackManager::progTrackBoosted=true;
+	    return true;
+#endif
+    case HASH_KEYWORD_RESET:
+        DCCTimer::reset();
+        break; // and <X> if we didnt restart 
+    
+
 #ifndef DISABLE_EEPROM
     case HASH_KEYWORD_EEPROM: // <D EEPROM NumEntries>
 	if (params >= 2)
 	    EEStore::dump(p[1]);
 	return true;
 #endif
-    case HASH_KEYWORD_SERVO:  // <D SERVO vpin position [profile]>
 
+    case HASH_KEYWORD_SPEED28:
+        DCC::setGlobalSpeedsteps(28);
+	StringFormatter::send(stream, F("28 Speedsteps"));
+        return true;
+
+    case HASH_KEYWORD_SPEED128:
+        DCC::setGlobalSpeedsteps(128);
+	StringFormatter::send(stream, F("128 Speedsteps"));
+        return true;
+
+    case HASH_KEYWORD_SERVO:  // <D SERVO vpin position [profile]>
     case HASH_KEYWORD_ANOUT:  // <D ANOUT vpin position [profile]>
         IODevice::writeAnalogue(p[1], p[2], params>3 ? p[3] : 0);
         break;
@@ -1237,7 +1223,7 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
         break;
 
     default: // invalid/unknown
-        return parseC(stream, params, p);
+        break;
     }
     return false;
 }

DCCEXParser.h

@@ -49,7 +49,6 @@ struct DCCEXParser
     static bool parseZ(Print * stream, int16_t params, int16_t p[]);
     static bool parseS(Print * stream, int16_t params, int16_t p[]);
     static bool parsef(Print * stream, int16_t params, int16_t p[]);
-    static bool parseC(Print * stream, int16_t params, int16_t p[]);
     static bool parseD(Print * stream, int16_t params, int16_t p[]);
 #ifndef IO_NO_HAL
     static bool parseI(Print * stream, int16_t params, int16_t p[]);

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202310230944Z"
+#define GITHUB_SHA "devel-202309241855Z"

WifiInterface.cpp

@@ -206,15 +206,14 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
       while(!wifiStream->available());
       version[i]=wifiStream->read();
       StringFormatter::printEscape(version[i]);
-    }
       if ((version[0] == '0') ||
 	  (version[0] == '2' && version[2] == '0') ||
 	  (version[0] == '2' && version[2] == '2' && version[4] == '0' && version[6] == '0')) {
-      DIAG(F("You need to up/downgrade the ESP firmware"));
+	SSid = F("DCCEX_SAYS_BROKEN_FIRMWARE");
-      SSid = F("UPDATE_ESP_FIRMWARE");
 	forceAP = true;
       }
     }
+  }
   checkForOK(2000, true, false);
 
 #ifdef DONT_TOUCH_WIFI_CONF

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.1.17"
+#define VERSION "5.1.16"
-// 5.1.17 - Divide out C for config and D for diag commands
 // 5.1.16 - Remove I2C address from EXTT_TURNTABLE macro to work with MUX, requires separate HAL macro to create
 // 5.1.15 - LCC/Adapter support and Exrail feature-compile-out.
 // 5.1.14 - Fixed IFTTPOSITION