rework constructor to fix sketches without subscriptions

toddtreece · toddtreece · commit 581650cebecd · 2016-08-09T14:20:21.000-04:00
diff --git a/AdafruitIO.cpp b/AdafruitIO.cpp
@@ -7,15 +7,59 @@
 //
 #include "AdafruitIO.h"
 
-AdafruitIO::AdafruitIO()
+AdafruitIO::AdafruitIO(const char *user, const char *key)
 {
   _mqtt = 0;
-  _username = 0;
-  _key = 0;
+  _username = user;
+  _key = key;
+  _err_topic = 0;
+  _throttle_topic = 0;
+  _err_sub = 0;
+  _throttle_sub = 0;
+
+  _init();
+}
+
+AdafruitIO::AdafruitIO(const __FlashStringHelper *user, const __FlashStringHelper *key)
+{
+  _mqtt = 0;
+  _username = (const char*)user;
+  _key = (const char*)key;
   _err_topic = 0;
   _throttle_topic = 0;
   _err_sub = 0;
   _throttle_sub = 0;
+
+  _init();
+}
+
+void errorCallback(char *err, uint16_t len)
+{
+  AIO_ERR_PRINTLN();
+  AIO_ERR_PRINT("ERROR: ");
+  AIO_ERR_PRINTLN(err);
+  AIO_ERR_PRINTLN();
+}
+
+void AdafruitIO::connect()
+{
+
+  if(_err_sub) {
+    // setup error sub
+    _err_sub = new Adafruit_MQTT_Subscribe(_mqtt, _err_topic);
+    _mqtt->subscribe(_err_sub);
+    _err_sub->setCallback(errorCallback);
+  }
+
+  if(_throttle_sub) {
+    // setup throttle sub
+    _throttle_sub = new Adafruit_MQTT_Subscribe(_mqtt, _throttle_topic);
+    _mqtt->subscribe(_throttle_sub);
+    _throttle_sub->setCallback(errorCallback);
+  }
+
+  _connect();
+
 }
 
 AdafruitIO::~AdafruitIO()
@@ -33,22 +77,6 @@ AdafruitIO::~AdafruitIO()
     delete _throttle_sub;
 }
 
-void AdafruitIO::connect(const char *user, const char *key)
-{
-  _username = user;
-  _key = key;
-
-  _init();
-}
-
-void AdafruitIO::connect(const __FlashStringHelper *user, const __FlashStringHelper *key)
-{
-  _username = (const char*)user;
-  _key = (const char*)key;
-
-  _init();
-}
-
 AdafruitIO_Feed* AdafruitIO::feed(const char* name)
 {
   return new AdafruitIO_Feed(this, name);
@@ -59,22 +87,12 @@ AdafruitIO_Feed* AdafruitIO::feed(const __FlashStringHelper *name)
   return new AdafruitIO_Feed(this, name);
 }
 
-void errorCallback(char *err, uint16_t len)
-{
-  AIO_ERR_PRINTLN();
-  AIO_ERR_PRINT("ERROR: ");
-  AIO_ERR_PRINTLN(err);
-  AIO_ERR_PRINTLN();
-}
-
 void AdafruitIO::_init()
 {
+
   // we have never pinged, so set last ping to now
   _last_ping = millis();
 
-  // call child class connect
-  _connect();
-
   // dynamically allocate memory for err topic
   _err_topic = (char *)malloc(sizeof(char) * (strlen(_username) + strlen(AIO_ERROR_TOPIC) + 1));
 
@@ -84,11 +102,6 @@ void AdafruitIO::_init()
     strcpy(_err_topic, _username);
     strcat(_err_topic, AIO_ERROR_TOPIC);
 
-    // setup error sub
-    _err_sub = new Adafruit_MQTT_Subscribe(_mqtt, _err_topic);
-    _mqtt->subscribe(_err_sub);
-    _err_sub->setCallback(errorCallback);
-
   } else {
 
     // malloc failed
@@ -105,17 +118,13 @@ void AdafruitIO::_init()
     strcpy(_throttle_topic, _username);
     strcat(_throttle_topic, AIO_THROTTLE_TOPIC);
 
-    // setup throttle sub
-    _throttle_sub = new Adafruit_MQTT_Subscribe(_mqtt, _throttle_topic);
-    _mqtt->subscribe(_throttle_sub);
-    _throttle_sub->setCallback(errorCallback);
-
   } else {
 
     // malloc failed
     _throttle_topic = 0;
 
   }
+
 }
 
 const __FlashStringHelper* AdafruitIO::statusText()
diff --git a/AdafruitIO.h b/AdafruitIO.h
@@ -27,11 +27,11 @@ class AdafruitIO {
   friend class AdafruitIO_Feed;
 
   public:
-    AdafruitIO();
+    AdafruitIO(const char *user, const char *key);
+    AdafruitIO(const __FlashStringHelper *user, const __FlashStringHelper *key);
     virtual ~AdafruitIO();
 
-    void connect(const char *user, const char *key);
-    void connect(const __FlashStringHelper *user, const __FlashStringHelper *key);
+    void connect();
 
     void run(uint16_t busywait_ms = 100);
 
@@ -46,7 +46,6 @@ class AdafruitIO {
 
   protected:
     virtual void _connect() = 0;
-
     aio_status_t _status = AIO_IDLE;
     uint32_t _last_ping = 0;
 
diff --git a/AdafruitIO_ESP8266.cpp b/AdafruitIO_ESP8266.cpp
@@ -9,15 +9,15 @@
 
 #include "AdafruitIO_ESP8266.h"
 
-AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char *ssid, const char *pass):AdafruitIO()
+AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char *user, const char *key, const char *ssid, const char *pass):AdafruitIO(user, key)
 {
   _ssid = ssid;
   _pass = pass;
   _client = new WiFiClientSecure;
   _mqtt = new Adafruit_MQTT_Client(_client, _host, _port);
 }
 
-AdafruitIO_ESP8266::AdafruitIO_ESP8266(const __FlashStringHelper *ssid, const __FlashStringHelper *pass):AdafruitIO()
+AdafruitIO_ESP8266::AdafruitIO_ESP8266(const __FlashStringHelper *user, const __FlashStringHelper *key, const __FlashStringHelper *ssid, const __FlashStringHelper *pass):AdafruitIO(user, key)
 {
   _ssid = (const char*)ssid;
   _pass = (const char*)pass;
diff --git a/AdafruitIO_ESP8266.h b/AdafruitIO_ESP8266.h
@@ -20,14 +20,15 @@
 class AdafruitIO_ESP8266 : public AdafruitIO {
 
   public:
-    AdafruitIO_ESP8266(const char *ssid, const char *pass);
-    AdafruitIO_ESP8266(const __FlashStringHelper *ssid, const __FlashStringHelper *pass);
+    AdafruitIO_ESP8266(const char *user, const char *key, const char *ssid, const char *pass);
+    AdafruitIO_ESP8266(const __FlashStringHelper *user, const __FlashStringHelper *key, const __FlashStringHelper *ssid, const __FlashStringHelper *pass);
     ~AdafruitIO_ESP8266();
 
     aio_status_t networkStatus();
 
   protected:
     void _connect();
+
     const char *_ssid;
     const char *_pass;
     WiFiClientSecure *_client;
diff --git a/AdafruitIO_Feed.cpp b/AdafruitIO_Feed.cpp
@@ -14,6 +14,8 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const char *n)
   name = n;
   _sub = 0;
   _pub = 0;
+
+  _init();
 }
 
 AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const __FlashStringHelper *n)
@@ -22,6 +24,8 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const __FlashStringHelper *n)
   name = (const char*)n;
   _sub = 0;
   _pub = 0;
+
+  _init();
 }
 
 AdafruitIO_Feed::~AdafruitIO_Feed()
@@ -41,9 +45,6 @@ AdafruitIO_Feed::~AdafruitIO_Feed()
 
 void AdafruitIO_Feed::onMessage(AdafruitIODataCallbackType cb)
 {
-  if(! _sub)
-    _init();
-
   _dataCallback = cb;
   _io->_mqtt->subscribe(_sub);
 
@@ -52,81 +53,54 @@ void AdafruitIO_Feed::onMessage(AdafruitIODataCallbackType cb)
 
 bool AdafruitIO_Feed::save(char *value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(bool value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(String value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(int value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(unsigned int value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(long value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(unsigned long value, double lat, double lon, double ele)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(float value, double lat, double lon, double ele, int precision)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele, precision);
   return _pub->publish(_data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(double value, double lat, double lon, double ele, int precision)
 {
-  if(! _pub)
-    init();
-
   _data->setValue(value, lat, lon, ele, precision);
   return _pub->publish(_data->toCSV());
 }
@@ -138,9 +112,6 @@ void AdafruitIO_Feed::setLocation(double lat, double lon, double ele)
 
 void AdafruitIO_Feed::subCallback(char *val, uint16_t len)
 {
-  if(! _dataCallback)
-    return;
-
   _data->setCSV(val);
   _dataCallback(_data);
 }
diff --git a/AdafruitIO_WiFi.h b/AdafruitIO_WiFi.h
@@ -29,10 +29,10 @@ class AdafruitIO_WiFi: public AdafruitIO_WINC1500 {
 class AdafruitIO_WiFi: public AdafruitIO_ESP8266 {
 
   public:
-    AdafruitIO_WiFi(const char *ssid, const char *pass) :
-      AdafruitIO_ESP8266(ssid, pass) {}
-    AdafruitIO_WiFi(const __FlashStringHelper *ssid, const __FlashStringHelper *pass) :
-      AdafruitIO_ESP8266(ssid, pass) {}
+    AdafruitIO_WiFi(const char *user, const char *key, const char *ssid, const char *pass) :
+      AdafruitIO_ESP8266(user, key, ssid, pass) {}
+    AdafruitIO_WiFi(const __FlashStringHelper *user, const __FlashStringHelper *key, const __FlashStringHelper *ssid, const __FlashStringHelper *pass) :
+      AdafruitIO_ESP8266(user, key, ssid, pass) {}
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@`
`9`	`9`
`10`	`10`	`#include "AdafruitIO_ESP8266.h"`
`11`	`11`
`12`		`-AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char ssid, const char pass):AdafruitIO()`
	`12`	`+AdafruitIO_ESP8266::AdafruitIO_ESP8266(const char user, const char key, const char ssid, const char pass):AdafruitIO(user, key)`
`13`	`13`	`{`
`14`	`14`	`_ssid = ssid;`
`15`	`15`	`_pass = pass;`
`16`	`16`	`_client = new WiFiClientSecure;`
`17`	`17`	`_mqtt = new Adafruit_MQTT_Client(_client, _host, _port);`
`18`	`18`	`}`
`19`	`19`
`20`		`-AdafruitIO_ESP8266::AdafruitIO_ESP8266(const __FlashStringHelper ssid, const __FlashStringHelper pass):AdafruitIO()`
	`20`	`+AdafruitIO_ESP8266::AdafruitIO_ESP8266(const __FlashStringHelper user, const __FlashStringHelper key, const __FlashStringHelper ssid, const __FlashStringHelper pass):AdafruitIO(user, key)`
`21`	`21`	`{`
`22`	`22`	`_ssid = (const char*)ssid;`
`23`	`23`	`_pass = (const char*)pass;`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO io, const char n)`
`14`	`14`	`name = n;`
`15`	`15`	`_sub = 0;`
`16`	`16`	`_pub = 0;`
	`17`	`+`
	`18`	`+ _init();`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO io, const __FlashStringHelper n)`
`@@ -22,6 +24,8 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO io, const __FlashStringHelper n)`
`22`	`24`	`name = (const char*)n;`
`23`	`25`	`_sub = 0;`
`24`	`26`	`_pub = 0;`
	`27`	`+`
	`28`	`+ _init();`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`AdafruitIO_Feed::~AdafruitIO_Feed()`
`@@ -41,9 +45,6 @@ AdafruitIO_Feed::~AdafruitIO_Feed()`
`41`	`45`
`42`	`46`	`void AdafruitIO_Feed::onMessage(AdafruitIODataCallbackType cb)`
`43`	`47`	`{`
`44`		`- if(! _sub)`
`45`		`- _init();`
`46`		`-`
`47`	`48`	`_dataCallback = cb;`
`48`	`49`	`_io->_mqtt->subscribe(_sub);`
`49`	`50`
`@@ -52,81 +53,54 @@ void AdafruitIO_Feed::onMessage(AdafruitIODataCallbackType cb)`
`52`	`53`
`53`	`54`	`bool AdafruitIO_Feed::save(char *value, double lat, double lon, double ele)`
`54`	`55`	`{`
`55`		`- if(! _pub)`
`56`		`- init();`
`57`		`-`
`58`	`56`	`_data->setValue(value, lat, lon, ele);`
`59`	`57`	`return _pub->publish(_data->toCSV());`
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`bool AdafruitIO_Feed::save(bool value, double lat, double lon, double ele)`
`63`	`61`	`{`
`64`		`- if(! _pub)`
`65`		`- init();`
`66`		`-`
`67`	`62`	`_data->setValue(value, lat, lon, ele);`
`68`	`63`	`return _pub->publish(_data->toCSV());`
`69`	`64`	`}`
`70`	`65`
`71`	`66`	`bool AdafruitIO_Feed::save(String value, double lat, double lon, double ele)`
`72`	`67`	`{`
`73`		`- if(! _pub)`
`74`		`- init();`
`75`		`-`
`76`	`68`	`_data->setValue(value, lat, lon, ele);`
`77`	`69`	`return _pub->publish(_data->toCSV());`
`78`	`70`	`}`
`79`	`71`
`80`	`72`	`bool AdafruitIO_Feed::save(int value, double lat, double lon, double ele)`
`81`	`73`	`{`
`82`		`- if(! _pub)`
`83`		`- init();`
`84`		`-`
`85`	`74`	`_data->setValue(value, lat, lon, ele);`
`86`	`75`	`return _pub->publish(_data->toCSV());`
`87`	`76`	`}`
`88`	`77`
`89`	`78`	`bool AdafruitIO_Feed::save(unsigned int value, double lat, double lon, double ele)`
`90`	`79`	`{`
`91`		`- if(! _pub)`
`92`		`- init();`
`93`		`-`
`94`	`80`	`_data->setValue(value, lat, lon, ele);`
`95`	`81`	`return _pub->publish(_data->toCSV());`
`96`	`82`	`}`
`97`	`83`
`98`	`84`	`bool AdafruitIO_Feed::save(long value, double lat, double lon, double ele)`
`99`	`85`	`{`
`100`		`- if(! _pub)`
`101`		`- init();`
`102`		`-`
`103`	`86`	`_data->setValue(value, lat, lon, ele);`
`104`	`87`	`return _pub->publish(_data->toCSV());`
`105`	`88`	`}`
`106`	`89`
`107`	`90`	`bool AdafruitIO_Feed::save(unsigned long value, double lat, double lon, double ele)`
`108`	`91`	`{`
`109`		`- if(! _pub)`
`110`		`- init();`
`111`		`-`
`112`	`92`	`_data->setValue(value, lat, lon, ele);`
`113`	`93`	`return _pub->publish(_data->toCSV());`
`114`	`94`	`}`
`115`	`95`
`116`	`96`	`bool AdafruitIO_Feed::save(float value, double lat, double lon, double ele, int precision)`
`117`	`97`	`{`
`118`		`- if(! _pub)`
`119`		`- init();`
`120`		`-`
`121`	`98`	`_data->setValue(value, lat, lon, ele, precision);`
`122`	`99`	`return _pub->publish(_data->toCSV());`
`123`	`100`	`}`
`124`	`101`
`125`	`102`	`bool AdafruitIO_Feed::save(double value, double lat, double lon, double ele, int precision)`
`126`	`103`	`{`
`127`		`- if(! _pub)`
`128`		`- init();`
`129`		`-`
`130`	`104`	`_data->setValue(value, lat, lon, ele, precision);`
`131`	`105`	`return _pub->publish(_data->toCSV());`
`132`	`106`	`}`
`@@ -138,9 +112,6 @@ void AdafruitIO_Feed::setLocation(double lat, double lon, double ele)`
`138`	`112`
`139`	`113`	`void AdafruitIO_Feed::subCallback(char *val, uint16_t len)`
`140`	`114`	`{`
`141`		`- if(! _dataCallback)`
`142`		`- return;`
`143`		`-`
`144`	`115`	`_data->setCSV(val);`
`145`	`116`	`_dataCallback(_data);`
`146`	`117`	`}`