Merge pull request #6 from adafruit/groups

Groups

Author: toddtreece

examples/adafruitio_06_digital_in/adafruitio_06_digital_in.ino

@@ -32,7 +32,7 @@ AdafruitIO_Feed *digital = io.feed("digital");
 void setup() {
 
   // set button pin as an input
-  pinMode(BUTTON_PIN, INPUT_PULLUP);
+  pinMode(BUTTON_PIN, INPUT);
 
   // start the serial connection
   Serial.begin(115200);

examples/adafruitio_11_group_pub/adafruitio_11_group_pub.ino

@@ -0,0 +1,76 @@
+// Adafruit IO Group Publish Example
+//
+// Adafruit invests time and resources providing this open source code.
+// Please support Adafruit and open source hardware by purchasing
+// products from Adafruit!
+//
+// Written by Todd Treece for Adafruit Industries
+// Copyright (c) 2016 Adafruit Industries
+// Licensed under the MIT license.
+//
+// All text above must be included in any redistribution.
+
+/************************** Configuration ***********************************/
+
+// edit the config.h tab and enter your Adafruit IO credentials
+// and any additional configuration needed for WiFi, cellular,
+// or ethernet clients.
+#include "config.h"
+
+/************************ Example Starts Here *******************************/
+
+// set up the group
+AdafruitIO_Group *group = io.group("example");
+
+int count_1 = 0;
+int count_2 = 0;
+
+void setup() {
+
+  // start the serial connection
+  Serial.begin(115200);
+
+  // wait for serial monitor to open
+  while(! Serial);
+
+  // connect to io.adafruit.com
+  Serial.print("Connecting to Adafruit IO");
+  io.connect();
+
+  // wait for a connection
+  while(io.status() < AIO_CONNECTED) {
+    Serial.print(".");
+    delay(500);
+  }
+
+  // we are connected
+  Serial.println();
+  Serial.println(io.statusText());
+
+}
+
+void loop() {
+
+  // io.run(); is required for all sketches.
+  // it should always be present at the top of your loop
+  // function. it keeps the client connected to
+  // io.adafruit.com, and processes any incoming data.
+  io.run();
+
+  group->set("count-1", count_1);
+  group->set("count-2", count_2);
+  group->save();
+
+  Serial.print("sending example.count-1 -> ");
+  Serial.println(count_1);
+  Serial.print("sending example.count-2 -> ");
+  Serial.println(count_2);
+
+  // increment the count_1 by 1
+  count_1 += 1;
+  // increment the count_2 by 2
+  count_2 *= 2;
+
+  // wait one second (1000 milliseconds == 1 second)
+  delay(1000);
+}

examples/adafruitio_11_group_pub/config.h

@@ -0,0 +1,43 @@
+/************************ Adafruit IO Config *******************************/
+
+// visit io.adafruit.com if you need to create an account,
+// or if you need your Adafruit IO key.
+#define IO_USERNAME    "your_username"
+#define IO_KEY         "your_key"
+
+/******************************* WIFI **************************************/
+
+// the AdafruitIO_WiFi client will work with the following boards:
+//   - HUZZAH ESP8266 Breakout -> https://www.adafruit.com/products/2471
+//   - Feather HUZZAH ESP8266 -> https://www.adafruit.com/products/2821
+//   - Feather M0 WiFi -> https://www.adafruit.com/products/3010
+//   - Feather WICED -> https://www.adafruit.com/products/3056
+
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PASS       "your_pass"
+
+// comment out the following two lines if you are using fona or ethernet
+#include "AdafruitIO_WiFi.h"
+AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
+
+
+/******************************* FONA **************************************/
+
+// the AdafruitIO_FONA client will work with the following boards:
+//   - Feather 32u4 FONA -> https://www.adafruit.com/product/3027
+
+// uncomment the following two lines for 32u4 FONA,
+// and comment out the AdafruitIO_WiFi client in the WIFI section
+// #include "AdafruitIO_FONA.h"
+// AdafruitIO_FONA io(IO_USERNAME, IO_KEY);
+
+
+/**************************** ETHERNET ************************************/
+
+// the AdafruitIO_Ethernet client will work with the following boards:
+//   - Ethernet FeatherWing -> https://www.adafruit.com/products/3201
+
+// uncomment the following two lines for ethernet,
+// and comment out the AdafruitIO_WiFi client in the WIFI section
+// #include "AdafruitIO_Ethernet.h"
+// AdafruitIO_Ethernet io(IO_USERNAME, IO_KEY);

examples/adafruitio_12_group_sub/adafruitio_12_group_sub.ino

@@ -0,0 +1,77 @@
+// Adafruit IO Group Subscribe Example
+//
+// Adafruit invests time and resources providing this open source code.
+// Please support Adafruit and open source hardware by purchasing
+// products from Adafruit!
+//
+// Written by Todd Treece for Adafruit Industries
+// Copyright (c) 2016 Adafruit Industries
+// Licensed under the MIT license.
+//
+// All text above must be included in any redistribution.
+
+/************************** Configuration ***********************************/
+
+// edit the config.h tab and enter your Adafruit IO credentials
+// and any additional configuration needed for WiFi, cellular,
+// or ethernet clients.
+#include "config.h"
+
+/************************ Example Starts Here *******************************/
+
+// set up the group
+AdafruitIO_Group *group = io.group("example");
+
+void setup() {
+
+  // start the serial connection
+  Serial.begin(115200);
+
+  // wait for serial monitor to open
+  while(! Serial);
+
+  // connect to io.adafruit.com
+  Serial.print("Connecting to Adafruit IO");
+  io.connect();
+
+  group->onMessage("count-1", one);
+  group->onMessage("count-2", two);
+
+  // wait for a connection
+  while(io.status() < AIO_CONNECTED) {
+    Serial.print(".");
+    delay(500);
+  }
+
+  // we are connected
+  Serial.println();
+  Serial.println(io.statusText());
+
+}
+
+void loop() {
+
+  // io.run(); is required for all sketches.
+  // it should always be present at the top of your loop
+  // function. it keeps the client connected to
+  // io.adafruit.com, and processes any incoming data.
+  io.run();
+
+}
+
+
+// this function is called whenever a 'counter-1' message
+// is received from Adafruit IO. it was attached to
+// the counter-1 feed in the setup() function above.
+void one(AdafruitIO_Data *data) {
+  Serial.print("received example.count-1 <- ");
+  Serial.println(data->value());
+}
+
+// this function is called whenever a 'counter-2' message
+// is received from Adafruit IO. it was attached to
+// the counter-2 feed in the setup() function above.
+void two(AdafruitIO_Data *data) {
+  Serial.print("received example.count-2 <- ");
+  Serial.println(data->value());
+}

examples/adafruitio_12_group_sub/config.h

@@ -0,0 +1,43 @@
+/************************ Adafruit IO Config *******************************/
+
+// visit io.adafruit.com if you need to create an account,
+// or if you need your Adafruit IO key.
+#define IO_USERNAME    "your_username"
+#define IO_KEY         "your_key"
+
+/******************************* WIFI **************************************/
+
+// the AdafruitIO_WiFi client will work with the following boards:
+//   - HUZZAH ESP8266 Breakout -> https://www.adafruit.com/products/2471
+//   - Feather HUZZAH ESP8266 -> https://www.adafruit.com/products/2821
+//   - Feather M0 WiFi -> https://www.adafruit.com/products/3010
+//   - Feather WICED -> https://www.adafruit.com/products/3056
+
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PASS       "your_pass"
+
+// comment out the following two lines if you are using fona or ethernet
+#include "AdafruitIO_WiFi.h"
+AdafruitIO_WiFi io(IO_USERNAME, IO_KEY, WIFI_SSID, WIFI_PASS);
+
+
+/******************************* FONA **************************************/
+
+// the AdafruitIO_FONA client will work with the following boards:
+//   - Feather 32u4 FONA -> https://www.adafruit.com/product/3027
+
+// uncomment the following two lines for 32u4 FONA,
+// and comment out the AdafruitIO_WiFi client in the WIFI section
+// #include "AdafruitIO_FONA.h"
+// AdafruitIO_FONA io(IO_USERNAME, IO_KEY);
+
+
+/**************************** ETHERNET ************************************/
+
+// the AdafruitIO_Ethernet client will work with the following boards:
+//   - Ethernet FeatherWing -> https://www.adafruit.com/products/3201
+
+// uncomment the following two lines for ethernet,
+// and comment out the AdafruitIO_WiFi client in the WIFI section
+// #include "AdafruitIO_Ethernet.h"
+// AdafruitIO_Ethernet io(IO_USERNAME, IO_KEY);

src/AdafruitIO.cpp

@@ -27,22 +27,6 @@ AdafruitIO::AdafruitIO(const char *user, const char *key)
   _init();
 }
 
-AdafruitIO::AdafruitIO(const __FlashStringHelper *user, const __FlashStringHelper *key)
-{
-  _mqtt = 0;
-  _http = 0;
-  _username = (const char*)user;
-  _key = (const char*)key;
-  _err_topic = 0;
-  _throttle_topic = 0;
-  _err_sub = 0;
-  _throttle_sub = 0;
-  _packetread_timeout = 100;
-  _user_agent = 0;
-
-  _init();
-}
-
 void errorCallback(char *err, uint16_t len)
 {
   AIO_ERR_PRINTLN();
@@ -92,9 +76,9 @@ AdafruitIO_Feed* AdafruitIO::feed(const char* name)
   return new AdafruitIO_Feed(this, name);
 }
 
-AdafruitIO_Feed* AdafruitIO::feed(const __FlashStringHelper *name)
+AdafruitIO_Group* AdafruitIO::group(const char* name)
 {
-  return new AdafruitIO_Feed(this, name);
+  return new AdafruitIO_Group(this, name);
 }
 
 AdafruitIO_Dashboard* AdafruitIO::dashboard(const char* name)

src/AdafruitIO.h

@@ -16,37 +16,37 @@
 #include "Adafruit_MQTT.h"
 #include "AdafruitIO_Definitions.h"
 #include "AdafruitIO_Feed.h"
+#include "AdafruitIO_Group.h"
 #include "AdafruitIO_Dashboard.h"
 #include "AdafruitIO_Data.h"
 #include "ArduinoHttpClient.h"
 #include "util/AdafruitIO_Board.h"
 
 #ifndef ADAFRUIT_MQTT_VERSION_MAJOR
-  #error "This sketch requires Adafruit MQTT Library v0.16.0 or higher. Please install or upgrade using the Library Manager."
+  #error "This sketch requires Adafruit MQTT Library v0.17.0 or higher. Please install or upgrade using the Library Manager."
 #endif
 
-#if ADAFRUIT_MQTT_VERSION_MAJOR == 0 && ADAFRUIT_MQTT_VERSION_MINOR < 16
-  #error "This sketch requires Adafruit MQTT Library v0.16.0 or higher. Please install or upgrade using the Library Manager."
+#if ADAFRUIT_MQTT_VERSION_MAJOR == 0 && ADAFRUIT_MQTT_VERSION_MINOR < 17
+  #error "This sketch requires Adafruit MQTT Library v0.17.0 or higher. Please install or upgrade using the Library Manager."
 #endif
 
 class AdafruitIO {
 
   friend class AdafruitIO_Feed;
+  friend class AdafruitIO_Group;
   friend class AdafruitIO_Dashboard;
   friend class AdafruitIO_Block;
 
   public:
     AdafruitIO(const char *user, const char *key);
-    AdafruitIO(const __FlashStringHelper *user, const __FlashStringHelper *key);
     virtual ~AdafruitIO();
 
     void connect();
 
     void run(uint16_t busywait_ms = 0);
 
     AdafruitIO_Feed* feed(const char *name);
-    AdafruitIO_Feed* feed(const __FlashStringHelper *name);
-
+    AdafruitIO_Group* group(const char *name);
     AdafruitIO_Dashboard* dashboard(const char *name);
 
     const __FlashStringHelper* statusText();