fixup! ArduinoIoTCloudTCP: switch to messages

Author: andreagilardoni

src/ArduinoIoTCloudTCP.cpp

@@ -75,6 +75,12 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()
 , _password("")
 #endif
 , _mqttClient{nullptr}
+, _deviceTopicOut("")
+, _deviceTopicIn("")
+, _shadowTopicOut("")
+, _shadowTopicIn("")
+, _dataTopicOut("")
+, _dataTopicIn("")
 #if OTA_ENABLED
 , _ota_cap{false}
 , _ota_error{static_cast<int>(OTAError::None)}
@@ -182,9 +188,8 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _mqttClient.setConnectionTimeout(1500);
   _mqttClient.setId(getDeviceId().c_str());
 
-  getTopic_devicein()  = getTopic_devicein();
-
-  _messageTopicIn  = getTopic_messagein();
+  _deviceTopicOut = getTopic_deviceout();
+  _deviceTopicIn  = getTopic_devicein();
 
   _thing.begin();
   _device.begin();
@@ -430,7 +435,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   }
 
   /* Topic for OTA properties and device configuration */
-  if (getTopic_devicein() == topic) {
+  if (_deviceTopicIn == topic) {
     CBORDecoder::decode(_device.getPropertyContainer(), (uint8_t*)bytes, length);
 
     /* Temporary check to avoid flooding device state machine with usless messages */
@@ -507,28 +512,6 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
 
 void ArduinoIoTCloudTCP::sendMessage(Message * msg)
 {
-  switch (msg->id)
-  {
-  case DeviceBeginCmdId:
-    sendDevicePropertiesToCloud();
-  break;
-
-  case ThingBeginCmdId:
-    requestThingId();
-  break;
-
-  case LastValuesBeginCmdId:
-    requestLastValue();
-  break;
-
-  case PropertiesUpdateCmdId:
-    sendThingPropertiesToCloud();
-  break;
-
-  default:
-  break;
-  }
-
   uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
   size_t bytes_encoded = sizeof(data);
   CBORMessageEncoder encoder;
@@ -566,24 +549,6 @@ void ArduinoIoTCloudTCP::sendThingPropertiesToCloud()
   sendPropertyContainerToCloud(_dataTopicOut, _thing.getPropertyContainer(), _thing.getPropertyContainerIndex());
 }
 
-void ArduinoIoTCloudTCP::sendDevicePropertiesToCloud()
-{
-  PropertyContainer ro_device_property_container;
-  unsigned int last_device_property_index = 0;
-
-  std::list<String> ro_device_property_list {"LIB_VERSION", "OTA_CAP", "OTA_ERROR", "OTA_SHA256"};
-  std::for_each(ro_device_property_list.begin(),
-                ro_device_property_list.end(),
-                [this, &ro_device_property_container ] (String const & name)
-                {
-                  Property* p = getProperty(this->_device.getPropertyContainer(), name);
-                  if(p != nullptr)
-                    addPropertyToContainer(ro_device_property_container, *p, p->name(), p->isWriteableByCloud() ? Permission::ReadWrite : Permission::Read);
-                }
-                );
-  sendPropertyContainerToCloud(getTopic_deviceout(), ro_device_property_container, last_device_property_index);
-}
-
 #if OTA_ENABLED
 void ArduinoIoTCloudTCP::sendDevicePropertyToCloud(String const name)
 {
@@ -594,31 +559,11 @@ void ArduinoIoTCloudTCP::sendDevicePropertyToCloud(String const name)
   if(p != nullptr)
   {
     addPropertyToContainer(temp_device_property_container, *p, p->name(), p->isWriteableByCloud() ? Permission::ReadWrite : Permission::Read);
-    sendPropertyContainerToCloud(getTopic_deviceout(), temp_device_property_container, last_device_property_index);
+    sendPropertyContainerToCloud(_deviceTopicOut, temp_device_property_container, last_device_property_index);
   }
 }
 #endif
 
-void ArduinoIoTCloudTCP::requestLastValue()
-{
-  // Send the getLastValues CBOR message to the cloud
-  // [{0: "r:m", 3: "getLastValues"}] = 81 A2 00 63 72 3A 6D 03 6D 67 65 74 4C 61 73 74 56 61 6C 75 65 73
-  // Use http://cbor.me to easily generate CBOR encoding
-  const uint8_t CBOR_REQUEST_LAST_VALUE_MSG[] = { 0x81, 0xA2, 0x00, 0x63, 0x72, 0x3A, 0x6D, 0x03, 0x6D, 0x67, 0x65, 0x74, 0x4C, 0x61, 0x73, 0x74, 0x56, 0x61, 0x6C, 0x75, 0x65, 0x73 };
-  write(_shadowTopicOut, CBOR_REQUEST_LAST_VALUE_MSG, sizeof(CBOR_REQUEST_LAST_VALUE_MSG));
-}
-
-void ArduinoIoTCloudTCP::requestThingId()
-{
-  if (!_mqttClient.subscribe(getTopic_devicein()))
-  {
-    /* If device_id is wrong the board can't connect to the broker so this condition
-    * should never happen.
-    */
-    DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, getTopic_devicein().c_str());
-  }
-}
-
 void ArduinoIoTCloudTCP::attachThing()
 {
 

src/ArduinoIoTCloudTCP.h

@@ -166,6 +166,10 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
 
     MqttClient _mqttClient;
 
+    String _deviceTopicOut;
+    String _deviceTopicIn;
+    String _shadowTopicOut;
+    String _shadowTopicIn;
     String _messageTopicOut;
     String _messageTopicIn;
     String _dataTopicOut;
@@ -184,6 +188,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     inline String getTopic_deviceout() { return String("/a/d/" + getDeviceId() + "/e/o");}
     inline String getTopic_devicein () { return String("/a/d/" + getDeviceId() + "/e/i");}
 
+    inline String getTopic_shadowout() { return ( getThingId().length() == 0) ? String("") : String("/a/t/" + getThingId() + "/shadow/o"); }
+    inline String getTopic_shadowin () { return ( getThingId().length() == 0) ? String("") : String("/a/t/" + getThingId() + "/shadow/i"); }
+
     inline String getTopic_messageout() { return String("/a/d/" + getDeviceId() + "/c/up");}
     inline String getTopic_messagein () { return String("/a/d/" + getDeviceId() + "/c/dw");}
 
@@ -206,6 +213,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
     void detachThing();
     int write(String const topic, byte const data[], int const length);
 
+#if OTA_ENABLED
+    void sendDevicePropertyToCloud(String const name);
+#endif
 };
 
 /******************************************************************************