Improved MQTT Setup Routine

Author: Manuel-Sensate

firmware-esp8266.ino

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v33 - Improved MQTT Setup Routine
     v32 - Added MQTT Support!
     v31 - Fixed an issue with DHT11 Sensors
     v30 - Added support for SSD1306 I2C Displays
@@ -26,14 +27,14 @@
 
 Display* display = NULL;
 
-int currentVersion = 32; 
+int currentVersion = 33; 
 boolean printMemory = false;
 
-String board = "Generic";
-char firmwareType[] = "ESP8266";
+// String board = "Generic";
+// char firmwareType[] = "ESP8266";
 
-// String board = "NodeMCU";
-// char firmwareType[] = "ESP8266-NodeMCU";
+String board = "NodeMCU";
+char firmwareType[] = "ESP8266-NodeMCU";
 
 // String board = "ESP12s";
 // char firmwareType[] = "ESP8266-ESP12s";

src/communication/RestServer.cpp

@@ -11,6 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
+    v33 - Improved MQTT Setup Routine
     v32 - Added MQTT Support!
     v29 - First Public Release
 */
@@ -28,6 +29,7 @@ extern const char *myHostname;
 extern Display* display;
 extern String bridgeURL;
 extern MQTT* mqtt;
+extern boolean enableMQTT;
 
 void startRestServer() {
   Serial.println("startRestServer");
@@ -240,6 +242,7 @@ void initMqtt() {
 
           yield();
         }
+        enableMQTT=true;
 
       }
       else
@@ -252,6 +255,7 @@ void initMqtt() {
         EEPROM.write(357, 0);
 
         mqtt = NULL;
+        enableMQTT=false;
 
         yield();
       }