Changing topic format from /ORG_ID/d/DEVICE_ID/* to /ORG_ID/t/THING_ID/*

In order for the new topic format to be used, the function setThingId must be called setting the ID of the THING - otherwise the old format is still used

Author: aentinger

src/ArduinoIoTCloud.cpp

@@ -9,9 +9,9 @@ const static int serialNumberAndAuthorityKeyIdentifierSlot = 11;
 const static int thingIdSlot                               = 12;
 
 ArduinoIoTCloudClass::ArduinoIoTCloudClass() :
+  _thing_id     (""),
   _bearSslClient(NULL),
-  // Size of the receive buffer
-  _mqttClient(MQTT_BUFFER_SIZE)
+  _mqttClient   (MQTT_BUFFER_SIZE)
 {
 }
 
@@ -71,10 +71,18 @@ int ArduinoIoTCloudClass::begin(Client& net, String brokerAddress)
 void ArduinoIoTCloudClass::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";
+  if(_thing_id == "") {
+    _stdoutTopic  = "/a/d/" + _id + "/s/o";
+    _stdinTopic   = "/a/d/" + _id + "/s/i";
+    _dataTopicIn  = "/a/d/" + _id + "/e/i";
+    _dataTopicOut = "/a/d/" + _id + "/e/o";
+  }
+  else {
+    _stdoutTopic  = "/a/t/" + _thing_id + "/s/o";
+    _stdinTopic   = "/a/t/" + _thing_id + "/s/i";
+    _dataTopicIn  = "/a/t/" + _thing_id + "/e/i";
+    _dataTopicOut = "/a/t/" + _thing_id + "/e/o";
+  }
 
   // use onMessage as callback for received mqtt messages
   _mqttClient.onMessageAdvanced(ArduinoIoTCloudClass::onMessage);

src/ArduinoIoTCloud.h

@@ -50,6 +50,8 @@ class ArduinoIoTCloudClass {
   // Clean up existing Mqtt connection, create a new one and initialize it
   int reconnect(Client& net);
 
+  inline void setThingId(String const thing_id) { _thing_id = thing_id; };
+
   #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
 
   static unsigned long const DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS = 100; /* Data rate throttled to 10 Hz */
@@ -87,8 +89,9 @@ class ArduinoIoTCloudClass {
   static void onMessage(MQTTClient *client, char topic[], char bytes[], int const length);
   void handleMessage(char topic[], char bytes[], int const length);
 
-  String _id;
-  String _brokerAddress;
+  String _id,
+         _thing_id,
+         _brokerAddress;
   ArduinoCloudThing Thing;
   BearSSLClient* _bearSslClient;
   MQTTClient _mqttClient;