Group get (#68)

* fix tiny memory/init bugs in Feed

* add group /get MQTT topic support, replace _io->_username with owner in Group class

* add get() to group sub example

* bump lib ver. for release, fix pub count-2, update header dates

Author: abachman

examples/adafruitio_11_group_pub/adafruitio_11_group_pub.ino

@@ -69,7 +69,7 @@ void loop() {
   // increment the count_1 by 1
   count_1 += 1;
   // increment the count_2 by 2
-  count_2 *= 2;
+  count_2 += 2;
 
   // wait four seconds (1000 milliseconds == 1 second)
   delay(4000);

examples/adafruitio_12_group_sub/adafruitio_12_group_sub.ino

@@ -5,7 +5,7 @@
 // products from Adafruit!
 //
 // Written by Todd Treece for Adafruit Industries
-// Copyright (c) 2016 Adafruit Industries
+// Copyright (c) 2018 Adafruit Industries
 // Licensed under the MIT license.
 //
 // All text above must be included in any redistribution.
@@ -34,8 +34,8 @@ void setup() {
   Serial.print("Connecting to Adafruit IO");
   io.connect();
 
-  group->onMessage("count-1", one);
-  group->onMessage("count-2", two);
+  group->onMessage("example.count-1", one);
+  group->onMessage("example.count-2", two);
 
   // wait for a connection
   while(io.status() < AIO_CONNECTED) {
@@ -47,6 +47,8 @@ void setup() {
   Serial.println();
   Serial.println(io.statusText());
 
+  // force IO to update our MQTT subscription with the current values of all feeds
+  group->get();
 }
 
 void loop() {

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit IO Arduino
-version=2.7.17   
+version=2.7.18   
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Arduino library to access Adafruit IO.

src/AdafruitIO_Feed.cpp

@@ -39,7 +39,7 @@ AdafruitIO_Feed::~AdafruitIO_Feed()
     delete _pub;
 
   if(_get_pub)
-    delete _pub;
+    delete _get_pub;
 
   if(data)
     delete data;
@@ -268,6 +268,7 @@ void AdafruitIO_Feed::_init()
 
     // malloc failed
     _topic = 0;
+    _get_topic = 0;
     _create_url = 0;
     _feed_url = 0;
     _sub = 0;

src/AdafruitIO_Group.cpp

@@ -16,6 +16,7 @@ AdafruitIO_Group::AdafruitIO_Group(AdafruitIO *io, const char *n):AdafruitIO_MQT
 {
   _io = io;
   name = n;
+  owner = _io->_username;
 
   _init();
 }
@@ -28,12 +29,18 @@ AdafruitIO_Group::~AdafruitIO_Group()
   if(_pub)
     delete _pub;
 
+  if(_get_pub)
+    delete _get_pub;
+
   if(data)
     delete data;
 
   if(_topic)
     free(_topic);
 
+  if (_get_topic)
+    free(_get_topic);
+
   if(_group_url)
     free(_group_url);
 
@@ -121,6 +128,11 @@ bool AdafruitIO_Group::save()
 
 }
 
+bool AdafruitIO_Group::get()
+{
+  return _get_pub->publish("\0");
+}
+
 AdafruitIO_Data* AdafruitIO_Group::getFeed(const char *feed)
 {
   // uint8_t i;
@@ -325,34 +337,42 @@ void AdafruitIO_Group::_init()
 {
 
   // dynamically allocate memory for mqtt topic and REST URLs
-  _topic = (char *) malloc(sizeof(char) * (strlen(_io->_username) + strlen(name) + 8)); // 8 extra chars for /g/, /csv & null termination
-  _group_url = (char *) malloc(sizeof(char) * (strlen(_io->_username) + strlen(name) + 16)); // 16 extra for api path & null term
-  _create_url = (char *) malloc(sizeof(char) * (strlen(_io->_username) + 15)); // 15 extra for api path & null term
+  _topic = (char *) malloc(sizeof(char) * (strlen(owner) + strlen(name) + 8)); // 8 extra chars for /g/, /csv & null termination
+  _get_topic = (char *) malloc(sizeof(char) * (strlen(owner) + strlen(name) + 12)); // 12 extra chars for /f/, /csv/get & null termination
+  _group_url = (char *) malloc(sizeof(char) * (strlen(owner) + strlen(name) + 16)); // 16 extra for api path & null term
+  _create_url = (char *) malloc(sizeof(char) * (strlen(owner) + 15)); // 15 extra for api path & null term
 
   data = 0;
 
   if(_topic && _create_url && _group_url) {
 
     // build topic string
-    strcpy(_topic, _io->_username);
+    strcpy(_topic, owner);
     strcat(_topic, "/g/");
     strcat(_topic, name);
     strcat(_topic, "/csv");
 
     // build feed url string
     strcpy(_group_url, "/api/v2/");
-    strcat(_group_url, _io->_username);
+    strcat(_group_url, owner);
     strcat(_group_url, "/groups/");
     strcat(_group_url, name);
 
     // build create url string
     strcpy(_create_url, "/api/v2/");
-    strcat(_create_url, _io->_username);
+    strcat(_create_url, owner);
     strcat(_create_url, "/groups");
 
+    // build /get topic string
+    strcpy(_get_topic, owner);
+    strcat(_get_topic, "/g/");
+    strcat(_get_topic, name);
+    strcat(_get_topic, "/csv/get");
+
     // setup subscription
     _sub = new Adafruit_MQTT_Subscribe(_io->_mqtt, _topic);
     _pub = new Adafruit_MQTT_Publish(_io->_mqtt, _topic);
+    _get_pub = new Adafruit_MQTT_Publish(_io->_mqtt, _get_topic);
     _io->_mqtt->subscribe(_sub);
 
     _sub->setCallback(this, &AdafruitIO_MQTT::subCallback);
@@ -361,10 +381,12 @@ void AdafruitIO_Group::_init()
 
     // malloc failed
     _topic = 0;
+    _get_topic = 0;
     _create_url = 0;
     _group_url = 0;
     _sub = 0;
     _pub = 0;
+    _get_pub = 0;
 
   }
 

src/AdafruitIO_Group.h

@@ -38,6 +38,7 @@ class AdafruitIO_Group : public AdafruitIO_MQTT {
     void set(const char *feed, double value);
 
     bool save();
+    bool get();
 
     void setLocation(double lat=0, double lon=0, double ele=0);
 
@@ -51,6 +52,7 @@ class AdafruitIO_Group : public AdafruitIO_MQTT {
     void call(AdafruitIO_Data *d);
 
     const char *name;
+    const char *owner;
 
     AdafruitIO_Data *data;
     AdafruitIO_Data* getFeed(const char *feed);
@@ -59,11 +61,13 @@ class AdafruitIO_Group : public AdafruitIO_MQTT {
     void _init();
 
     char *_topic;
+    char *_get_topic;
     char *_create_url;
     char *_group_url;
 
     Adafruit_MQTT_Subscribe *_sub;
     Adafruit_MQTT_Publish *_pub;
+    Adafruit_MQTT_Publish *_get_pub;
 
     AdafruitIO *_io;
     AdafruitIOGroupCallback *_groupCallback;