Merge ad3ff43602 into 749a859db5

WifiInterface.cpp

@@ -201,16 +201,15 @@ 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')) {
       DIAG(F("You need to up/downgrade the ESP firmware"));
       SSid = F("UPDATE_ESP_FIRMWARE");
       forceAP = true;

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.0.7"
+#define VERSION "5.0.6"
-// 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.