Merge d1775c69e6 into 8b8e9e4919

EXRAILMacros.h

@@ -172,8 +172,6 @@ void  RMFT2::printMessage(uint16_t id) {
 #include "EXRAIL2MacroReset.h"
 #undef TURNOUT
 #define TURNOUT(id,addr,subaddr,description...) O_DESC(id,description)
-#undef TURNOUTL
-#define TURNOUTL(id,addr,description...) O_DESC(id,description)
 #undef PIN_TURNOUT
 #define PIN_TURNOUT(id,pin,description...) O_DESC(id,description)
 #undef SERVO_TURNOUT

WifiInterface.cpp

@@ -201,21 +201,19 @@ 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-xxx";
+    char version[] = "0.0.0.0";
-    for (int i=0; i<11;i++) {
+    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'
+	  (version[0] == '2' && version[2] == '2' && version[4] == '0' && version[6] == '0')) {
-	 && version[7] == '-' && version[8] == 'd' && version[9] == 'e' && version[10] == 'v')) {
+	SSid = F("DCCEX_SAYS_BROKEN_FIRMWARE");
-      DIAG(F("You need to up/downgrade the ESP firmware"));
-      SSid = F("UPDATE_ESP_FIRMWARE");
 	forceAP = true;
       }
     }
+  }
   checkForOK(2000, true, false);
 
 #ifdef DONT_TOUCH_WIFI_CONF

version.h

@@ -3,10 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.0.7"
+#define VERSION "5.0.4"
-// 5.0.7  - Only flag 2.2.0.0-dev as broken, not 2.2.0.0
-// 5.0.6  - Bugfix lost TURNOUTL description
-// 5.0.5  - Bugfix version detection logic and better message
 // 5.0.4  - Bugfix: <JR> misses default roster. 
 // 5.0.3  - Check bad AT firmware version
 // 5.0.2  - Bugfix: ESP32 30ms off time