use new mqtt class for io callbacks

Author: toddtreece

src/AdafruitIO_Feed.cpp

@@ -12,13 +12,12 @@
 #include "AdafruitIO_Feed.h"
 #include "AdafruitIO.h"
 
-AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const char *n)
+AdafruitIO_Feed::AdafruitIO_Feed(AdafruitIO *io, const char *n):AdafruitIO_MQTT()
 {
   _io = io;
   name = n;
   _sub = 0;
   _pub = 0;
-  _dataCallback = 0;
 
   _init();
 }
@@ -179,7 +178,7 @@ void AdafruitIO_Feed::_init()
     _pub = new Adafruit_MQTT_Publish(_io->_mqtt, _topic);
     _io->_mqtt->subscribe(_sub);
 
-    _sub->setCallback(this, &AdafruitIO_Feed::subCallback);
+    _sub->setCallback(this, &AdafruitIO_MQTT::subCallback);
 
   } else {
 

src/AdafruitIO_Feed.h

@@ -16,18 +16,17 @@
 #include "Adafruit_MQTT.h"
 #include "AdafruitIO_Definitions.h"
 #include "AdafruitIO_Data.h"
+#include "AdafruitIO_MQTT.h"
 
 // forward declaration
 class AdafruitIO;
 
-class AdafruitIO_Feed {
+class AdafruitIO_Feed : public AdafruitIO_MQTT {
 
   public:
     AdafruitIO_Feed(AdafruitIO *io, const char *name);
     ~AdafruitIO_Feed();
 
-    void onMessage(AdafruitIODataCallbackType cb);
-
     bool save(char *value, double lat=0, double lon=0, double ele=0);
     bool save(bool value, double lat=0, double lon=0, double ele=0);
     bool save(String value, double lat=0, double lon=0, double ele=0);
@@ -43,12 +42,16 @@ class AdafruitIO_Feed {
 
     void setLocation(double lat, double lon, double ele=0);
 
+    void onMessage(AdafruitIODataCallbackType cb);
     void subCallback(char *val, uint16_t len);
+
     const char *name;
 
     AdafruitIO_Data *data;
 
   private:
+    AdafruitIODataCallbackType _dataCallback;
+
     void _init();
 
     char *_topic;
@@ -60,7 +63,6 @@ class AdafruitIO_Feed {
 
     AdafruitIO *_io;
     AdafruitIO_Data *_data;
-    AdafruitIODataCallbackType _dataCallback;
 
 };
 

src/AdafruitIO_MQTT.h

@@ -0,0 +1,25 @@
+//
+// Adafruit invests time and resources providing this open source code.
+// Please support Adafruit and open source hardware by purchasing
+// products from Adafruit!
+//
+// Copyright (c) 2015-2016 Adafruit Industries
+// Authors: Todd Treece
+// Licensed under the MIT license.
+//
+// All text above must be included in any redistribution.
+//
+#ifndef ADAFRUITIO_MQTT_H
+#define ADAFRUITIO_MQTT_H
+
+#include "Arduino.h"
+
+class AdafruitIO_MQTT {
+
+  public:
+    AdafruitIO_MQTT() {}
+    virtual void subCallback(char *val, uint16_t len) = 0;
+
+};
+
+#endif // ADAFRUITIO_MQTT_H