Merge 62a204b65c into c55fa9f9d2

DCCEXParser.cpp

@@ -121,7 +121,7 @@ Once a new OPCODE is decided upon, update this list.
     for (int16_t i=0;;i+=sizeof(flashList[0])) {                            \
         int16_t value=GETHIGHFLASHW(flashList,i);       \
         if (value==INT16_MAX) break;                            \
-        StringFormatter::send(stream,F(" %d"),value);	\
+        if (value != 0) StringFormatter::send(stream,F(" %d"),value);	\
     }                                   
 
 
@@ -729,14 +729,10 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                     SENDFLASHLIST(stream,RMFT2::rosterIdList)
                 }
                 else {
-                    auto rosterName= RMFT2::getRosterName(id);
-                    if (!rosterName) rosterName=F("");
-
-                    auto functionNames= RMFT2::getRosterFunctions(id);
-                    if (!functionNames) functionNames=RMFT2::getRosterFunctions(0);
-                    if (!functionNames) functionNames=F("");
+		  const FSH * functionNames= RMFT2::getRosterFunctions(id);
 		  StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
-					                            id, rosterName, functionNames);
+					id, RMFT2::getRosterName(id),
+					functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames);
 		}
 #endif          
                 StringFormatter::send(stream, F(">\n"));      
@@ -989,7 +985,7 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
 
     case HASH_KEYWORD_RAM: // <D RAM>
         StringFormatter::send(stream, F("Free memory=%d\n"), DCCTimer::getMinimumFreeMemory());
-        return true;
+        break;
 
 #ifndef DISABLE_PROG
     case HASH_KEYWORD_ACK: // <D ACK ON/OFF> <D ACK [LIMIT|MIN|MAX|RETRY] Value>

WifiInterface.cpp

@@ -200,21 +200,7 @@ wifiSerialState WifiInterface::setup2(const FSH* SSid, const FSH* password,
 
   // Display the AT version information
   StringFormatter::send(wifiStream, F("AT+GMR\r\n")); 
-  if (checkForOK(2000, F("AT version:"), true, false)) {
-    char version[] = "0.0.0.0";
-    for (int i=0; i<8;i++) {
-      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')) {
-	SSid = F("DCCEX_SAYS_BROKEN_FIRMWARE");
-	forceAP = true;
-      }
-    }
-  }
-  checkForOK(2000, true, false);
+  checkForOK(2000, true, false);      // Makes this visible on the console
 
 #ifdef DONT_TOUCH_WIFI_CONF
   DIAG(F("DONT_TOUCH_WIFI_CONF was set: Using existing config"));

myHal.cpp_example.txt

@@ -24,7 +24,6 @@
 //#include "IO_TouchKeypad.h  // Touch keypad with 16 keys
 //#include "IO_EXTurntable.h"   // Turntable-EX turntable controller
 //#include "IO_EXFastClock.h"  // FastClock driver
-//#include "IO_PCA9555.h"     // 16-bit I/O expander (NXP & Texas Instruments).
 
 //==========================================================================
 // The function halSetup() is invoked from CS if it exists within the build.
@@ -52,7 +51,7 @@ void halSetup() {
   // Create a 20x4 LCD display device as display number 2 
   // (line 0 is written by EX-RAIL 'SCREEN(2, 0, "text")').
 
-  // HALDisplay<LiquidCrystal>::create(2, 0x27, 20, 4);
+  // HALDisplay<LiquidCrystal>(2, 0x27, 20, 4);
 
 
   //=======================================================================

version.h

@@ -3,9 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.0.4"
-// 5.0.4  - Bugfix: <JR> misses default roster. 
-// 5.0.3  - Check bad AT firmware version
+#define VERSION "5.0.2"
 // 5.0.2  - Bugfix: ESP32 30ms off time
 // 5.0.1  - Bugfix: execute 30ms off time before rejoin
 // 5.0.0  - Make 4.2.69 the 5.0.0 release