tcp fixup

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -63,7 +63,6 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
 , _connection_attempt(0,0)
 , _message_stream(std::bind(&ArduinoIoTCloudTCP::sendMessage, this, std::placeholders::_1))
 , _thing(&_message_stream)
-, _thing_id_property{nullptr}
 , _device(&_message_stream)
 , _mqtt_data_buf{0}
 , _mqtt_data_len{0}
@@ -77,6 +76,8 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
 , _mqttClient{nullptr}
 , _deviceTopicOut("")
 , _deviceTopicIn("")
+, _messageTopicOut("")
+, _messageTopicIn("")
 , _dataTopicOut("")
 , _dataTopicIn("")
 #if OTA_ENABLED
@@ -319,10 +320,16 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
 {
   if (_mqttClient.connect(_brokerAddress.c_str(), _brokerPort))
   {
+    /* Subscribe to message topic to receive commands */
     _mqttClient.subscribe(_messageTopicIn);
-    DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
+
+    /* Temoporarly subsribe to device topic to receive OTA properties */
+    _mqttClient.subscribe(_deviceTopicIn);
+
     /* Reconfigure timers for next state */
     _connection_attempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms, AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms);
+
+    DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
     return State::Connected;
   }
 
@@ -339,6 +346,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_Connected()
 {
   if (!_mqttClient.connected() || !_thing.connected() || !_device.connected())
   {
+    Serial.println("State::Disconnect");
     return State::Disconnect;
   }
 
@@ -437,28 +445,6 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   /* Topic for OTA properties and device configuration */
   if (_deviceTopicIn == topic) {
     CBORDecoder::decode(_device.getPropertyContainer(), (uint8_t*)bytes, length);
-
-    /* Temporary check to avoid flooding device state machine with usless messages */
-    if (_thing_id_property->isDifferentFromCloud()) {
-      _thing_id_property->fromCloudToLocal();
-
-      Message message;
-      /* If we are attached we need first to detach */
-      if (_device.isAttached()) {
-        detachThing();
-        message = { DeviceDetachedCmdId };
-      }
-      /* If received thing id is valid attach to the new thing */
-      if (_thing_id.length()) {
-        attachThing();
-        message = { DeviceAttachedCmdId };
-      } else {
-        /* Send message to device state machine to inform we have received a null thing-id */
-        _thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
-        message = { DeviceRegisteredCmdId };
-      }
-      _device.handleMessage(&message);
-    }
   }
 
   /* Topic for user input data */
@@ -479,9 +465,26 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
       {
         case CommandId::ThingUpdateCmdId:
         {
-          _thing_id = String(command.thingBeginCmd.params.thing_id);
           DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] device configuration received", __FUNCTION__, millis());
-          _device.handleMessage((Message*)&command);
+          if ( _thing_id != String(command.thingBeginCmd.params.thing_id)) {
+            _thing_id = String(command.thingBeginCmd.params.thing_id);
+            Message message;
+            /* If we are attached we need first to detach */
+            if (_device.isAttached()) {
+              detachThing();
+              message = { DeviceDetachedCmdId };
+            }
+            /* If received thing id is valid attach to the new thing */
+            if (_thing_id.length()) {
+              attachThing();
+              message = { DeviceAttachedCmdId };
+            } else {
+              /* Send message to device state machine to inform we have received a null thing-id */
+              _thing_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx";
+              message = { DeviceRegisteredCmdId };
+            }
+            _device.handleMessage(&message);
+          }
         }
         break;
 
@@ -516,6 +519,25 @@ void ArduinoIoTCloudTCP::sendMessage(Message * msg)
   size_t bytes_encoded = sizeof(data);
   CBORMessageEncoder encoder;
 
+  switch (msg->id) {
+    case PropertiesUpdateCmdId:
+      return sendPropertyContainerToCloud(_dataTopicOut,
+                                          _thing.getPropertyContainer(),
+                                          _thing.getPropertyContainerIndex());
+      break;
+
+#if OTA_ENABLED
+    case DeviceBeginCmdId:
+      sendDevicePropertyToCloud("OTA_CAP");
+      sendDevicePropertyToCloud("OTA_ERROR");
+      sendDevicePropertyToCloud("OTA_SHA256");
+      break;
+#endif
+
+    default:
+      break;
+  }
+
   if (encoder.encode(msg, data, bytes_encoded) == Encoder::Status::Complete &&
       bytes_encoded > 0) {
     write(_messageTopicOut, data, bytes_encoded);
@@ -544,11 +566,6 @@ void ArduinoIoTCloudTCP::sendPropertyContainerToCloud(String const topic, Proper
   }
 }
 
-void ArduinoIoTCloudTCP::sendThingPropertiesToCloud()
-{
-  sendPropertyContainerToCloud(_dataTopicOut, _thing.getPropertyContainer(), _thing.getPropertyContainerIndex());
-}
-
 #if OTA_ENABLED
 void ArduinoIoTCloudTCP::sendDevicePropertyToCloud(String const name)
 {

src/ArduinoIoTCloudTCP.h

@@ -128,7 +128,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     TimedAttempt _connection_attempt;
     MessageStream _message_stream;
     ArduinoCloudThing _thing;
-    Property * _thing_id_property;
     ArduinoCloudDevice _device;
 
     String _brokerAddress;
@@ -202,7 +201,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     void handleMessage(int length);
     void sendMessage(Message * msg);
     void sendPropertyContainerToCloud(String const topic, PropertyContainer & property_container, unsigned int & current_property_index);
-    void sendThingPropertiesToCloud();
 
     void attachThing();
     void detachThing();