Requested changes from pull request comments

Author: sellensr

src/AdafruitIO.cpp

@@ -168,18 +168,15 @@ const __FlashStringHelper* AdafruitIO::statusText()
 aio_status_t AdafruitIO::run(uint16_t busywait_ms)
 {
   uint32_t timeStart = millis();
-  aio_status_t net_status = networkStatus();
-  // If we aren't connected, return network status -- fail quickly
-  // Previous version would just hang on a network error
-  if(net_status != AIO_NET_CONNECTED) {
-    _status = net_status;
-    return _status;
+  // If we aren't network connected, return status -- fail quickly
+  if(status() < AIO_NET_CONNECTED) {
+    return status();
   }
 
   // loop until we have a connection
   // mqttStatus() will try to reconnect before returning
-  while(mqttStatus() != AIO_CONNECTED && millis() - timeStart < ADAFRUITIO_RUN_TIMEOUT){}
-  if(mqttStatus() != AIO_CONNECTED) return _status;
+  while(mqttStatus() != AIO_CONNECTED && millis() - timeStart < AIO_MQTT_CONNECTION_TIMEOUT){}
+  if(mqttStatus() != AIO_CONNECTED) return status();
 
   if(busywait_ms > 0)
     _packetread_timeout = busywait_ms;
@@ -191,7 +188,7 @@ aio_status_t AdafruitIO::run(uint16_t busywait_ms)
     _mqtt->ping();
     _last_ping = millis();
   }
-  return _status;
+  return status();
 }
 
 aio_status_t AdafruitIO::status()
@@ -253,7 +250,7 @@ aio_status_t AdafruitIO::mqttStatus()
 
   if(_mqtt->connected())
     return AIO_CONNECTED;
-  
+
   switch(_mqtt->connect(_username, _key)) {
     case 0:
       return AIO_CONNECTED;

src/AdafruitIO.h

@@ -12,10 +12,6 @@
 #ifndef ADAFRUITIO_H
 #define ADAFRUITIO_H
 
-#ifndef ADAFRUITIO_RUN_TIMEOUT
-#define ADAFRUITIO_RUN_TIMEOUT  60000
-#endif
-
 #include "Arduino.h"
 #include "Adafruit_MQTT.h"
 #include "AdafruitIO_Definitions.h"

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"