Merge pull request #163 from LaCoolCo/fix/online-mode

Fix MQTT onlinemode bug
LeClubSandwichStudio · Jun 28, 2018 · 0ea852c · 0ea852c
2 parents ebb2509 + ad23270
commit 0ea852c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/core/CoolBoard.cpp b/src/core/CoolBoard.cpp
@@ -516,12 +516,18 @@ void CoolBoard::mqttConnect() {
     if (this->coolPubSubClient->connect(this->mqttId.c_str())) {
       this->coolPubSubClient->subscribe(this->mqttInTopic.c_str());
       INFO_LOG("Subscribed to MQTT input topic");
+      mqttRetries = 0;
     } else {
       WARN_LOG("MQTT connection failed, retrying");
+      mqttRetries++;
     }
     delay(5);
     i++;
   }
+  if (mqttRetries >= MAX_MQTT_RETRIES) {
+    SPIFFS.end();
+    ESP.restart();
+  }
 }
 
 void CoolBoard::mqttLog(String data) {

diff --git a/src/core/CoolBoard.h b/src/core/CoolBoard.h
@@ -41,10 +41,11 @@
 
 #define ENABLE_I2C_PIN 5
 #define BOOTSTRAP_PIN 0
-#define MQTT_RETRIES 5
 #define MIN_BAT_VOLTAGE 3.5
 #define NOT_IN_CHARGING 1.8
 #define LOW_POWER_SLEEP 300
+#define MQTT_RETRIES 5
+#define MAX_MQTT_RETRIES 15
 
 class CoolBoard {
 
@@ -86,6 +87,7 @@ class CoolBoard {
   void mqttLog(String data);
 
 private:
+  uint8_t mqttRetries = 0;
   CoolBoardSensors coolBoardSensors;
   CoolBoardLed coolBoardLed;
   CoolWifi *coolWifi = new CoolWifi;