Merge pull request #100 from sellensr/master

Don't crash on network disconnect
adafruit · Dec 18, 2019 · 1e70236 · 1e70236
2 parents 23985c6 + 3950f25
commit 1e70236
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit IO Arduino
-version=3.2.3
+version=3.3.0
 author=Adafruit
 maintainer=Adafruit <adafruitio@adafruit.com>
 sentence=Arduino library to access Adafruit IO.

diff --git a/src/AdafruitIO.cpp b/src/AdafruitIO.cpp
@@ -165,10 +165,18 @@ const __FlashStringHelper* AdafruitIO::statusText()
   }
 }
 
-void AdafruitIO::run(uint16_t busywait_ms)
+aio_status_t AdafruitIO::run(uint16_t busywait_ms)
 {
+  uint32_t timeStart = millis();
+  // If we aren't network connected, return status -- fail quickly
+  if(status() < AIO_NET_CONNECTED) {
+    return status();
+  }
+
   // loop until we have a connection
-  while(mqttStatus() != AIO_CONNECTED){}
+  // mqttStatus() will try to reconnect before returning
+  while(mqttStatus() != AIO_CONNECTED && millis() - timeStart < AIO_MQTT_CONNECTION_TIMEOUT){}
+  if(mqttStatus() != AIO_CONNECTED) return status();
 
   if(busywait_ms > 0)
     _packetread_timeout = busywait_ms;
@@ -180,6 +188,7 @@ void AdafruitIO::run(uint16_t busywait_ms)
     _mqtt->ping();
     _last_ping = millis();
   }
+  return status();
 }
 
 aio_status_t AdafruitIO::status()

diff --git a/src/AdafruitIO.h b/src/AdafruitIO.h
@@ -45,7 +45,7 @@ class AdafruitIO {
     virtual ~AdafruitIO();
 
     void connect();
-    void run(uint16_t busywait_ms = 0);
+    aio_status_t run(uint16_t busywait_ms = 0);
 
     AdafruitIO_Feed* feed(const char *name);
     AdafruitIO_Feed* feed(const char *name, const char *owner);

diff --git a/src/AdafruitIO_Definitions.h b/src/AdafruitIO_Definitions.h
@@ -72,6 +72,8 @@ class AdafruitIOGroupCallback {
 #define AIO_PING_INTERVAL 60000
 // Time to wait between re-connecting to Adafruit IO after throttled
 #define AIO_THROTTLE_RECONNECT_INTERVAL 60000
+// Time to wait for a successful reconnection of MQTT
+#define AIO_MQTT_CONNECTION_TIMEOUT  60000
 
 #define AIO_ERROR_TOPIC "/errors"
 #define AIO_THROTTLE_TOPIC "/throttle"