Split _property_container in _device_property_container and _thing_property container

pennam · pennam · commit db3e9433c612 · 2022-01-24T11:08:02.000+01:00
diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp
@@ -44,12 +44,12 @@ ArduinoIoTCloudClass::ArduinoIoTCloudClass()
 
 void ArduinoIoTCloudClass::push()
 {
-  requestUpdateForAllProperties(_property_container);
+  requestUpdateForAllProperties(_thing_property_container);
 }
 
 bool ArduinoIoTCloudClass::setTimestamp(String const & prop_name, unsigned long const timestamp)
 {
-  Property * p = getProperty(_property_container, prop_name);
+  Property * p = getProperty(_thing_property_container, prop_name);
 
   if (p == nullptr)
     return false;
@@ -81,20 +81,30 @@ void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int
   }
 
   if (seconds == ON_CHANGE) {
-    addPropertyToContainer(_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
+    addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
   } else {
-    addPropertyToContainer(_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
+    addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
   }
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, Permission const permission)
 {
-  return addPropertyToContainer(_property_container, property, name, permission);
+  return addPropertyToContainer(_thing_property_container, property, name, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int tag, Permission const permission)
 {
-  return addPropertyToContainer(_property_container, property, name, permission, tag);
+  return addPropertyToContainer(_thing_property_container, property, name, permission, tag);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyToContainer(prop_cont, property, name, permission, -1);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
+{
+  return addPropertyToContainer(prop_cont, property, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -110,13 +120,23 @@ void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag,
 
 Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission)
 {
-  return addPropertyReal(property, name, -1, permission);
+  return addPropertyReal(property, _thing_property_container, name, -1, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
+{
+  return addPropertyReal(property, _thing_property_container, name, tag, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyReal(property, prop_cont, name, -1, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperBool(property);
-  return addPropertyToContainer(_property_container, *p, name, permission, tag);
+  return addPropertyToContainer(prop_cont, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -132,13 +152,23 @@ void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag
 
 Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission)
 {
-  return addPropertyReal(property, name, -1, permission);
+  return addPropertyReal(property, _thing_property_container, name, -1, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
+{
+  return addPropertyReal(property, _thing_property_container, name, tag, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(float& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyReal(property, prop_cont, name, -1, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(float& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperFloat(property);
-  return addPropertyToContainer(_property_container, *p, name, permission, tag);
+  return addPropertyToContainer(prop_cont, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -154,13 +184,23 @@ void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag,
 
 Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission)
 {
-  return addPropertyReal(property, name, -1, permission);
+  return addPropertyReal(property, _thing_property_container, name, -1, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
+{
+  return addPropertyReal(property, _thing_property_container, name, tag, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(int& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyReal(property, prop_cont, name, -1, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperInt(property);
-  return addPropertyToContainer(_property_container, *p, name, permission, tag);
+  return addPropertyToContainer(prop_cont, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -176,13 +216,23 @@ void ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name,
 
 Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, Permission const permission)
 {
-  return addPropertyReal(property, name, -1, permission);
+  return addPropertyReal(property, _thing_property_container, name, -1, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, int tag, Permission const permission)
+{
+  return addPropertyReal(property, _thing_property_container, name, tag, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyReal(property, prop_cont, name, -1, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperUnsignedInt(property);
-  return addPropertyToContainer(_property_container, *p, name, permission, tag);
+  return addPropertyToContainer(prop_cont, *p, name, permission, tag);
 }
 
 void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
@@ -198,13 +248,23 @@ void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int ta
 
 Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission)
 {
-  return addPropertyReal(property, name, -1, permission);
+  return addPropertyReal(property, _thing_property_container, name, -1, permission);
 }
 
 Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
+{
+  return addPropertyReal(property, _thing_property_container, name, tag, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(String& property, PropertyContainer &prop_cont, String name, Permission const permission)
+{
+  return addPropertyReal(property, prop_cont, name, -1, permission);
+}
+
+Property& ArduinoIoTCloudClass::addPropertyReal(String& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)
 {
   Property* p = new CloudWrapperString(property);
-  return addPropertyToContainer(_property_container, *p, name, permission, tag);
+  return addPropertyToContainer(prop_cont, *p, name, permission, tag);
 }
 
 /******************************************************************************
diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h
@@ -96,6 +96,9 @@ class ArduinoIoTCloudClass
     inline void     setDeviceId(String const device_id) { _device_id = device_id; };
     inline String & getDeviceId()                       { return _device_id; };
 
+    inline bool     deviceNotAttached()                  { return _thing_id == "null";}
+    inline bool     deviceNotConfigured()                { return _thing_id == "";}
+
     inline ConnectionHandler * getConnection()          { return _connection; }
 
     inline unsigned long getInternalTime()              { return _time_service.getTime(); }
@@ -124,6 +127,20 @@ class ArduinoIoTCloudClass
     Property& addPropertyReal(unsigned int& property, String name, Permission const permission);
     Property& addPropertyReal(String& property, String name, Permission const permission);
 
+    Property& addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+    Property& addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+    Property& addPropertyReal(float& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+    Property& addPropertyReal(int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+    Property& addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+    Property& addPropertyReal(String& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission);
+
+    Property& addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, Permission const permission);
+    Property& addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, Permission const permission);
+    Property& addPropertyReal(float& property, PropertyContainer &prop_cont, String name, Permission const permission);
+    Property& addPropertyReal(int& property, PropertyContainer &prop_cont, String name, Permission const permission);
+    Property& addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, Permission const permission);
+    Property& addPropertyReal(String& property, PropertyContainer &prop_cont, String name, Permission const permission);
+
     /* The following methods are for MKR WAN 1300/1310 LoRa boards since
      * they use a number to identify a given property within a CBOR message.
      * This approach reduces the required amount of data which is of great
@@ -147,17 +164,18 @@ class ArduinoIoTCloudClass
   protected:
 
     ConnectionHandler * _connection;
-    PropertyContainer _property_container;
+    PropertyContainer _device_property_container;
+    PropertyContainer _thing_property_container;
     unsigned int _last_checked_property_index;
     TimeService & _time_service;
     int _tz_offset;
     unsigned int _tz_dst_until;
+    String _thing_id;
 
     void execCloudEventCallback(ArduinoIoTCloudEvent const event);
 
   private:
 
-    String _thing_id;
     String _device_id;
     OnCloudEventCallback _cloud_event_callback[3];
 };
diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp
@@ -121,7 +121,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_Connected()
 
   /* Check if a primitive property wrapper is locally changed. */
   updateTimestampOnLocallyChangedProperties(_property_container);
-  
+
   /* Decode available data. */
   if (_connection->available())
     decodePropertiesFromCloud();
@@ -142,15 +142,15 @@ void ArduinoIoTCloudLPWAN::decodePropertiesFromCloud()
   {
     lora_msg_buf[bytes_received] = _connection->read();
   }
-  CBORDecoder::decode(_property_container, lora_msg_buf, bytes_received);
+  CBORDecoder::decode(_thing_property_container, lora_msg_buf, bytes_received);
 }
 
 void ArduinoIoTCloudLPWAN::sendPropertiesToCloud()
 {
   int bytes_encoded = 0;
   uint8_t data[CBOR_LORA_MSG_MAX_SIZE];
 
-  if (CBOREncoder::encode(_property_container, data, sizeof(data), bytes_encoded, _last_checked_property_index, true) == CborNoError)
+  if (CBOREncoder::encode(_thing_property_container, data, sizeof(data), bytes_encoded, _last_checked_property_index, true) == CborNoError)
     if (bytes_encoded > 0)
       writeProperties(data, bytes_encoded);
 }
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -243,15 +243,17 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _dataTopicIn    = getTopic_datain();
 
 #if OTA_ENABLED
-  addPropertyReal(_ota_cap, "OTA_CAP", Permission::Read);
-  addPropertyReal(_ota_error, "OTA_ERROR", Permission::Read);
-  addPropertyReal(_ota_img_sha256, "OTA_SHA256", Permission::Read);
-  addPropertyReal(_ota_url, "OTA_URL", Permission::ReadWrite).onSync(CLOUD_WINS);
-  addPropertyReal(_ota_req, "OTA_REQ", Permission::ReadWrite).onSync(CLOUD_WINS);
+  addPropertyReal(_ota_cap, _device_property_container, "OTA_CAP", Permission::Read);
+  addPropertyReal(_ota_error, _device_property_container, "OTA_ERROR", Permission::Read);
+  addPropertyReal(_ota_img_sha256, _device_property_container, "OTA_SHA256", Permission::Read);
+  addPropertyReal(_ota_url, _device_property_container, "OTA_URL", Permission::ReadWrite).onSync(CLOUD_WINS);
+  addPropertyReal(_ota_req, _device_property_container, "OTA_REQ", Permission::ReadWrite).onSync(CLOUD_WINS);
 #endif /* OTA_ENABLED */
 
-  addPropertyReal(_tz_offset, "tz_offset", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
-  addPropertyReal(_tz_dst_until, "tz_dst_until", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
+  addPropertyReal(_tz_offset, _thing_property_container, "tz_offset", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
+  addPropertyReal(_tz_dst_until, _thing_property_container, "tz_dst_until", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
+
+  addPropertyReal(_thing_id, _device_property_container, "thing_id", Permission::ReadWrite).onUpdate(setThingIdOutdated);
 
 #if OTA_STORAGE_PORTENTA_QSPI
   #define BOOTLOADER_ADDR   (0x8000000)
@@ -524,7 +526,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
     * the connection from being established due to a wrong data
     * in the reconstructed certificate.
     */
-    updateTimestampOnLocallyChangedProperties(_property_container);
+    updateTimestampOnLocallyChangedProperties(_thing_property_container);
 
     /* Retransmit data in case there was a lost transaction due
     * to phy layer or MQTT connectivity loss.
@@ -586,13 +588,13 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   }
 
   if (_dataTopicIn == topic) {
-    CBORDecoder::decode(_property_container, (uint8_t*)bytes, length);
+    CBORDecoder::decode(_thing_property_container, (uint8_t*)bytes, length);
   }
 
   if ((_shadowTopicIn == topic) && (_state == State::RequestLastValues))
   {
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] last values received", __FUNCTION__, millis());
-    CBORDecoder::decode(_property_container, (uint8_t*)bytes, length, true);
+    CBORDecoder::decode(_thing_property_container, (uint8_t*)bytes, length, true);
     sendPropertiesToCloud();
     _time_service.setTimeZoneData(_tz_offset, _tz_dst_until);
     execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
@@ -602,7 +604,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   }
 }
 
-void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(PropertyContainer & property_container, unsigned int & current_property_index)
+void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(String const topic, PropertyContainer & property_container, unsigned int & current_property_index)
 {
   int bytes_encoded = 0;
   uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
@@ -616,13 +618,14 @@ void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(PropertyContainer & proper
       _mqtt_data_len = bytes_encoded;
       memcpy(_mqtt_data_buf, data, _mqtt_data_len);
       /* Transmit the properties to the MQTT broker */
-      write(_dataTopicOut, _mqtt_data_buf, _mqtt_data_len);
+      DEBUG_INFO("ArduinoIoTCloudTCP::%s send data to %s", __FUNCTION__, topic.c_str());
+      write(topic, _mqtt_data_buf, _mqtt_data_len);
     }
 }
 
 void ArduinoIoTCloudTCP::sendPropertiesToCloud()
 {
-  sendPropertyContainerToCloud(_property_container, _last_checked_property_index);
+  sendPropertyContainerToCloud(_thing_property_container, _last_checked_property_index);
 }
 
 #if OTA_ENABLED
@@ -636,7 +639,7 @@ void ArduinoIoTCloudTCP::sendOTAPropertiesToCloud()
                 ota_property_list.cend(),
                 [this, &ota_property_container ] (String const & name)
                 {
-                  Property* p = getProperty(this->_property_container, name);
+                  Property* p = getProperty(this->_device_property_container, name);
                   if(p != nullptr)
                     addPropertyToContainer(ota_property_container, *p, p->name(), p->isWriteableByCloud() ? Permission::ReadWrite : Permission::Read);
                 }
diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h
@@ -166,7 +166,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
     static void onMessage(int length);
     void handleMessage(int length);
-    void sendPropertyContainerToCloud(PropertyContainer & property_container, unsigned int & current_property_index);
+    void sendPropertyContainerToCloud(String const topic, PropertyContainer & property_container, unsigned int & current_property_index);
     void sendPropertiesToCloud();
     void requestLastValue();
     int write(String const topic, byte const data[], int const length);
@@ -184,4 +184,4 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
 extern ArduinoIoTCloudTCP ArduinoCloud;
 
-#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ ArduinoIoTCloudClass::ArduinoIoTCloudClass()`
`44`	`44`
`45`	`45`	`void ArduinoIoTCloudClass::push()`
`46`	`46`	`{`
`47`		`- requestUpdateForAllProperties(_property_container);`
	`47`	`+ requestUpdateForAllProperties(_thing_property_container);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`bool ArduinoIoTCloudClass::setTimestamp(String const & prop_name, unsigned long const timestamp)`
`51`	`51`	`{`
`52`		`- Property * p = getProperty(_property_container, prop_name);`
	`52`	`+ Property * p = getProperty(_thing_property_container, prop_name);`
`53`	`53`
`54`	`54`	`if (p == nullptr)`
`55`	`55`	`return false;`
`@@ -81,20 +81,30 @@ void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (seconds == ON_CHANGE) {`
`84`		`- addPropertyToContainer(_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);`
	`84`	`+ addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);`
`85`	`85`	`} else {`
`86`		`- addPropertyToContainer(_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);`
	`86`	`+ addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, Permission const permission)`
`91`	`91`	`{`
`92`		`- return addPropertyToContainer(_property_container, property, name, permission);`
	`92`	`+ return addPropertyToContainer(_thing_property_container, property, name, permission);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int tag, Permission const permission)`
`96`	`96`	`{`
`97`		`- return addPropertyToContainer(_property_container, property, name, permission, tag);`
	`97`	`+ return addPropertyToContainer(_thing_property_container, property, name, permission, tag);`
	`98`	`+}`
	`99`	`+`
	`100`	`+Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`101`	`+{`
	`102`	`+ return addPropertyToContainer(prop_cont, property, name, permission, -1);`
	`103`	`+}`
	`104`	`+`
	`105`	`+Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
	`106`	`+{`
	`107`	`+ return addPropertyToContainer(prop_cont, property, name, permission, tag);`
`98`	`108`	`}`
`99`	`109`
`100`	`110`	`void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -110,13 +120,23 @@ void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag,`
`110`	`120`
`111`	`121`	`Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission)`
`112`	`122`	`{`
`113`		`- return addPropertyReal(property, name, -1, permission);`
	`123`	`+ return addPropertyReal(property, _thing_property_container, name, -1, permission);`
`114`	`124`	`}`
`115`	`125`
`116`	`126`	`Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)`
	`127`	`+{`
	`128`	`+ return addPropertyReal(property, _thing_property_container, name, tag, permission);`
	`129`	`+}`
	`130`	`+`
	`131`	`+Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`132`	`+{`
	`133`	`+ return addPropertyReal(property, prop_cont, name, -1, permission);`
	`134`	`+}`
	`135`	`+`
	`136`	`+Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
`117`	`137`	`{`
`118`	`138`	`Property* p = new CloudWrapperBool(property);`
`119`		`- return addPropertyToContainer(_property_container, *p, name, permission, tag);`
	`139`	`+ return addPropertyToContainer(prop_cont, *p, name, permission, tag);`
`120`	`140`	`}`
`121`	`141`
`122`	`142`	`void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -132,13 +152,23 @@ void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag`
`132`	`152`
`133`	`153`	`Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission)`
`134`	`154`	`{`
`135`		`- return addPropertyReal(property, name, -1, permission);`
	`155`	`+ return addPropertyReal(property, _thing_property_container, name, -1, permission);`
`136`	`156`	`}`
`137`	`157`
`138`	`158`	`Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)`
	`159`	`+{`
	`160`	`+ return addPropertyReal(property, _thing_property_container, name, tag, permission);`
	`161`	`+}`
	`162`	`+`
	`163`	`+Property& ArduinoIoTCloudClass::addPropertyReal(float& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`164`	`+{`
	`165`	`+ return addPropertyReal(property, prop_cont, name, -1, permission);`
	`166`	`+}`
	`167`	`+`
	`168`	`+Property& ArduinoIoTCloudClass::addPropertyReal(float& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
`139`	`169`	`{`
`140`	`170`	`Property* p = new CloudWrapperFloat(property);`
`141`		`- return addPropertyToContainer(_property_container, *p, name, permission, tag);`
	`171`	`+ return addPropertyToContainer(prop_cont, *p, name, permission, tag);`
`142`	`172`	`}`
`143`	`173`
`144`	`174`	`void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -154,13 +184,23 @@ void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag,`
`154`	`184`
`155`	`185`	`Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission)`
`156`	`186`	`{`
`157`		`- return addPropertyReal(property, name, -1, permission);`
	`187`	`+ return addPropertyReal(property, _thing_property_container, name, -1, permission);`
`158`	`188`	`}`
`159`	`189`
`160`	`190`	`Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)`
	`191`	`+{`
	`192`	`+ return addPropertyReal(property, _thing_property_container, name, tag, permission);`
	`193`	`+}`
	`194`	`+`
	`195`	`+Property& ArduinoIoTCloudClass::addPropertyReal(int& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`196`	`+{`
	`197`	`+ return addPropertyReal(property, prop_cont, name, -1, permission);`
	`198`	`+}`
	`199`	`+`
	`200`	`+Property& ArduinoIoTCloudClass::addPropertyReal(int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
`161`	`201`	`{`
`162`	`202`	`Property* p = new CloudWrapperInt(property);`
`163`		`- return addPropertyToContainer(_property_container, *p, name, permission, tag);`
	`203`	`+ return addPropertyToContainer(prop_cont, *p, name, permission, tag);`
`164`	`204`	`}`
`165`	`205`
`166`	`206`	`void ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -176,13 +216,23 @@ void ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name,`
`176`	`216`
`177`	`217`	`Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, Permission const permission)`
`178`	`218`	`{`
`179`		`- return addPropertyReal(property, name, -1, permission);`
	`219`	`+ return addPropertyReal(property, _thing_property_container, name, -1, permission);`
`180`	`220`	`}`
`181`	`221`
`182`	`222`	`Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, String name, int tag, Permission const permission)`
	`223`	`+{`
	`224`	`+ return addPropertyReal(property, _thing_property_container, name, tag, permission);`
	`225`	`+}`
	`226`	`+`
	`227`	`+Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`228`	`+{`
	`229`	`+ return addPropertyReal(property, prop_cont, name, -1, permission);`
	`230`	`+}`
	`231`	`+`
	`232`	`+Property& ArduinoIoTCloudClass::addPropertyReal(unsigned int& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
`183`	`233`	`{`
`184`	`234`	`Property* p = new CloudWrapperUnsignedInt(property);`
`185`		`- return addPropertyToContainer(_property_container, *p, name, permission, tag);`
	`235`	`+ return addPropertyToContainer(prop_cont, *p, name, permission, tag);`
`186`	`236`	`}`
`187`	`237`
`188`	`238`	`void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(fn)(void), float minDelta, void(synFn)(Property & property))`
`@@ -198,13 +248,23 @@ void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int ta`
`198`	`248`
`199`	`249`	`Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission)`
`200`	`250`	`{`
`201`		`- return addPropertyReal(property, name, -1, permission);`
	`251`	`+ return addPropertyReal(property, _thing_property_container, name, -1, permission);`
`202`	`252`	`}`
`203`	`253`
`204`	`254`	`Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)`
	`255`	`+{`
	`256`	`+ return addPropertyReal(property, _thing_property_container, name, tag, permission);`
	`257`	`+}`
	`258`	`+`
	`259`	`+Property& ArduinoIoTCloudClass::addPropertyReal(String& property, PropertyContainer &prop_cont, String name, Permission const permission)`
	`260`	`+{`
	`261`	`+ return addPropertyReal(property, prop_cont, name, -1, permission);`
	`262`	`+}`
	`263`	`+`
	`264`	`+Property& ArduinoIoTCloudClass::addPropertyReal(String& property, PropertyContainer &prop_cont, String name, int tag, Permission const permission)`
`205`	`265`	`{`
`206`	`266`	`Property* p = new CloudWrapperString(property);`
`207`		`- return addPropertyToContainer(_property_container, *p, name, permission, tag);`
	`267`	`+ return addPropertyToContainer(prop_cont, *p, name, permission, tag);`
`208`	`268`	`}`
`209`	`269`
`210`	`270`	`/******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_Connected()`
`121`	`121`
`122`	`122`	`/* Check if a primitive property wrapper is locally changed. */`
`123`	`123`	`updateTimestampOnLocallyChangedProperties(_property_container);`
`124`		`-`
	`124`	`+`
`125`	`125`	`/* Decode available data. */`
`126`	`126`	`if (_connection->available())`
`127`	`127`	`decodePropertiesFromCloud();`
`@@ -142,15 +142,15 @@ void ArduinoIoTCloudLPWAN::decodePropertiesFromCloud()`
`142`	`142`	`{`
`143`	`143`	`lora_msg_buf[bytes_received] = _connection->read();`
`144`	`144`	`}`
`145`		`- CBORDecoder::decode(_property_container, lora_msg_buf, bytes_received);`
	`145`	`+ CBORDecoder::decode(_thing_property_container, lora_msg_buf, bytes_received);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`void ArduinoIoTCloudLPWAN::sendPropertiesToCloud()`
`149`	`149`	`{`
`150`	`150`	`int bytes_encoded = 0;`
`151`	`151`	`uint8_t data[CBOR_LORA_MSG_MAX_SIZE];`
`152`	`152`
`153`		`- if (CBOREncoder::encode(_property_container, data, sizeof(data), bytes_encoded, _last_checked_property_index, true) == CborNoError)`
	`153`	`+ if (CBOREncoder::encode(_thing_property_container, data, sizeof(data), bytes_encoded, _last_checked_property_index, true) == CborNoError)`
`154`	`154`	`if (bytes_encoded > 0)`
`155`	`155`	`writeProperties(data, bytes_encoded);`
`156`	`156`	`}`