make feed data a public property of feed

Author: toddtreece

AdafruitIO_Feed.cpp

@@ -18,6 +18,7 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const char *n)
   name = n;
   _sub = 0;
   _pub = 0;
+  _dataCallback = 0;
 
   _init();
 }
@@ -28,6 +29,7 @@ AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const __FlashStringHelper *n)
   name = (const char*)n;
   _sub = 0;
   _pub = 0;
+  _dataCallback = 0;
 
   _init();
 }
@@ -40,8 +42,8 @@ AdafruitIO_Feed::~AdafruitIO_Feed()
   if(_pub)
     delete _pub;
 
-  if(_data)
-    delete _data;
+  if(data)
+    delete data;
 
   if(_topic)
     free(_topic);
@@ -50,74 +52,74 @@ AdafruitIO_Feed::~AdafruitIO_Feed()
 void AdafruitIO_Feed::onMessage(AdafruitIODataCallbackType cb)
 {
   _dataCallback = cb;
-  _io->_mqtt->subscribe(_sub);
-
-  _sub->setCallback(this, &AdafruitIO_Feed::subCallback);
 }
 
 bool AdafruitIO_Feed::save(char *value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(bool value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(String value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(int value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(unsigned int value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(long value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele);
+  return _pub->publish(data->toCSV());
 }
 
 bool AdafruitIO_Feed::save(unsigned long value, double lat, double lon, double ele)
 {
-  _data->setValue(value, lat, lon, ele);
-  return _pub->publish(_data->toCSV());
+  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)
 {
-  _data->setValue(value, lat, lon, ele, precision);
-  return _pub->publish(_data->toCSV());
+  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)
 {
-  _data->setValue(value, lat, lon, ele, precision);
-  return _pub->publish(_data->toCSV());
+  data->setValue(value, lat, lon, ele, precision);
+  return _pub->publish(data->toCSV());
 }
 
 void AdafruitIO_Feed::setLocation(double lat, double lon, double ele)
 {
-  _data->setLocation(lat, lon, ele);
+  data->setLocation(lat, lon, ele);
 }
 
 void AdafruitIO_Feed::subCallback(char *val, uint16_t len)
 {
-  _data->setCSV(val);
-  _dataCallback(_data);
+  data->setCSV(val);
+
+  // call callback with data
+  if(_dataCallback)
+    _dataCallback(data);
 }
 
 void AdafruitIO_Feed::_init()
@@ -127,7 +129,7 @@ void AdafruitIO_Feed::_init()
   _topic = (char *) malloc(sizeof(char) * (strlen(_io->_username) + strlen(name) + 8)); // 8 extra chars for /f/, /csv & null termination
 
   // init feed data
-  _data = new AdafruitIO_Data(this);
+  data = new AdafruitIO_Data(this);
 
   if(_topic) {
 
@@ -140,14 +142,17 @@ void AdafruitIO_Feed::_init()
     // setup subscription
     _sub = new Adafruit_MQTT_Subscribe(_io->_mqtt, _topic);
     _pub = new Adafruit_MQTT_Publish(_io->_mqtt, _topic);
+    _io->_mqtt->subscribe(_sub);
+
+    _sub->setCallback(this, &AdafruitIO_Feed::subCallback);
 
   } else {
 
     // malloc failed
     _topic = 0;
     _sub = 0;
     _pub = 0;
-    _data = 0;
+    data = 0;
 
   }
 

AdafruitIO_Feed.h

@@ -44,6 +44,8 @@ class AdafruitIO_Feed {
     void subCallback(char *val, uint16_t len);
     const char *name;
 
+    AdafruitIO_Data *data;
+
   private:
     void _init();