Merge pull request #5 from bcmi-labs/thing_integration

Thing integration

Author: facchinm

Diff for: examples/MKR1000_Cloud_Blink/MKR1000_Cloud_Blink.ino

@@ -16,6 +16,13 @@ unsigned long getTime() {
   return WiFi.getTime();
 }
 
+int position;
+
+void onPositionUpdate() {
+  Serial.print("New position value: ");
+  Serial.println(position);
+}
+
 void setup() {
   //Initialize serial and wait for port to open:
   Serial.begin(9600);
@@ -73,6 +80,8 @@ void setup() {
 
   Serial.println("Successfully connected to Arduino Cloud :)");
 
+  ArduinoCloud.addProperty(position, READ, 10*SECONDS, onPositionUpdate);
+
   CloudSerial.begin(9600);
   CloudSerial.print("I'm ready for blinking!\n");
 }

Diff for: src/ArduinoCloud.cpp

@@ -62,6 +62,8 @@ int ArduinoCloudClass::begin(Client& net)
   // Begin function for the MQTTClient
   mqttClientBegin(*_bearSslClient);
 
+  Thing.begin();
+
   return 1;
 }
 
@@ -71,6 +73,8 @@ void ArduinoCloudClass::mqttClientBegin(Client& net)
   // MQTT topics definition
   _stdoutTopic = "/a/d/" + _id + "/s/o";
   _stdinTopic = "/a/d/" + _id + "/s/i";
+  _dataTopicIn = "/a/d/" + _id + "/e/i";
+  _dataTopicOut = "/a/d/" + _id + "/e/o";
 
   // use onMessage as callback for received mqtt messages
   _mqttClient.onMessageAdvanced(ArduinoCloudClass::onMessage);
@@ -88,6 +92,7 @@ int ArduinoCloudClass::connect()
     return 0;
   }
   _mqttClient.subscribe(_stdinTopic);
+  _mqttClient.subscribe(_dataTopicIn);
 
   return 1;
 }
@@ -139,6 +144,12 @@ void ArduinoCloudClass::poll(int reconnectionMaxRetries, int reconnectionTimeout
 
   // MTTQClient connected!, poll() used to retrieve data from MQTT broker
   _mqttClient.loop();
+
+  uint8_t data[MQTT_BUFFER_SIZE];
+  int length = Thing.poll(data, sizeof(data));
+  if (length > 0) {
+    writeProperties(data, length);
+  }
 }
 
 void ArduinoCloudClass::reconnect(Client& net)
@@ -158,6 +169,11 @@ int ArduinoCloudClass::connected()
   return _mqttClient.connected();
 }
 
+int ArduinoCloudClass::writeProperties(const byte data[], int length)
+{
+  return _mqttClient.publish(_dataTopicOut.c_str(), (const char*)data, length);
+}
+
 int ArduinoCloudClass::writeStdout(const byte data[], int length)
 {
   return _mqttClient.publish(_stdoutTopic.c_str(), (const char*)data, length);
@@ -173,6 +189,9 @@ void ArduinoCloudClass::handleMessage(char topic[], char bytes[], int length)
   if (_stdinTopic == topic) {
     CloudSerial.appendStdin((uint8_t*)bytes, length);
   }
+  if (_dataTopicIn == topic) {
+    Thing.decode((uint8_t*)bytes, length);
+  }
 }
 
 ArduinoCloudClass ArduinoCloud;

Diff for: src/ArduinoCloudV2.h

@@ -3,6 +3,7 @@
 
 #include <MQTTClient.h>
 #include <ArduinoBearSSL.h>
+#include <ArduinoCloudThing.h>
 
 #include "CloudSerial.h"
 
@@ -41,9 +42,24 @@ class ArduinoCloudClass {
   // Clean up existing Mqtt connection, create a new one and initialize it
   void reconnect(Client& net);
 
+  #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
+
+  template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, T minDelta = T(0), void(*fn)(void) = NULL) {
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
+  }
+
+  template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, T minDelta = T(0)) {
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
+  }
+
+  template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, void(*fn)(void) = NULL, long seconds = ON_CHANGE, T minDelta = T(0)) {
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
+  }
+
 protected:
   friend class CloudSerialClass;
   int writeStdout(const byte data[], int length);
+  int writeProperties(const byte data[], int length);
   // Used to initialize MQTTClient
   void mqttClientBegin(Client& net);
   // Function in charge of perform MQTT reconnection, basing on class parameters(retries,and timeout)
@@ -54,12 +70,16 @@ class ArduinoCloudClass {
   void handleMessage(char topic[], char bytes[], int length);
 
   String _id;
+  ArduinoCloudThing Thing;
   BearSSLClient* _bearSslClient;
   MQTTClient _mqttClient;
 
   // Class attribute to define MTTQ topics 2 for stdIn/out and 2 for data, in order to avoid getting previous pupblished payload
   String _stdinTopic;
   String _stdoutTopic;
+  String _dataTopicOut;
+  String _dataTopicIn;
+  String _otaTopic;
 };
 
 extern ArduinoCloudClass ArduinoCloud;