Fix models

Author: mirkokurt

src/ArduinoIoTCloudTCP.cpp

@@ -328,7 +328,10 @@ void ArduinoIoTCloudTCP::encode(){
   if (MessageEncoder::encode(message, data, sizeof(data), bytes_encoded) == CborNoError)
     if (bytes_encoded > 0)
     {
-      DEBUG_INFO("Data are %s", data);
+      DEBUG_INFO("Data size is %d", sizeof(data));
+      for (int i = 0; i < 50; i++) {
+        DEBUG_INFO("%02X", data[i]);
+      }
     } else {
       DEBUG_INFO("No data sent");
     }

src/cbor/MessageDecoder.cpp

@@ -121,7 +121,7 @@ MessageDecoder::ArrayParserState MessageDecoder::handle_EnterArray(CborValue * m
 }
 
 MessageDecoder::ArrayParserState MessageDecoder::decodeGetThingIdCommand(CborValue * param, Message * message) {
-  GetThingIdCommand * thingCommand = (GetThingIdCommand *) message;
+  ThingGetIdCmdDown * thingCommand = (ThingGetIdCmdDown *) message;
 
   // Message is composed of a single parameter, a string (thing_id)
   if (copyCBORStringToArray(param, thingCommand->fields.params.thing_id, sizeof(thingCommand->fields.params.thing_id))) {
@@ -160,7 +160,7 @@ MessageDecoder::ArrayParserState MessageDecoder::decodeSetTimezoneCommand(CborVa
 }
 
 MessageDecoder::ArrayParserState MessageDecoder::decodeSetLastValueCommand(CborValue * param, Message * message) {
-  SetLastValueCommand * setLv = (SetLastValueCommand *) message;
+  ThingGetLastValueCmdDown * setLv = (ThingGetLastValueCmdDown *) message;
 
   // Message is composed TODO
 
@@ -169,7 +169,7 @@ MessageDecoder::ArrayParserState MessageDecoder::decodeSetLastValueCommand(CborV
 }
 
 MessageDecoder::ArrayParserState MessageDecoder::decodeOTAAvailableCommand(CborValue * param, Message * message) {
-  OTAavailable * ota = (OTAavailable *) message;
+  OtaUpdateCmdDown * ota = (OtaUpdateCmdDown *) message;
 
   // Message is composed 4 parameters: id, url, initialSha, finalSha
   if (copyCBORStringToArray(param, ota->fields.params.id, sizeof(ota->fields.params.id))) {
@@ -216,16 +216,16 @@ MessageDecoder::ArrayParserState MessageDecoder::handle_Param(CborValue * param,
 
   switch (message->id)
   {
-  case CommandID::GetThingIdCommandId:
+  case CommandID::ThingGetIdCmdDownId:
     return MessageDecoder::decodeGetThingIdCommand(param, message);
 
-  case CommandID::SetTimezoneCommandId:
+  case CommandID::TimezoneCommandDownId:
     return MessageDecoder::decodeSetTimezoneCommand(param, message);
 
-  case CommandID::SetLastValueCommandId:
+  case CommandID::ThingGetLastValueCmdDownId:
     return MessageDecoder::decodeSetLastValueCommand(param, message);
 
-  case CommandID::OTAavailableId:
+  case CommandID::OtaUpdateCmdDownId:
     return MessageDecoder::decodeOTAAvailableCommand(param, message);
 
   default:

src/cbor/MessageEncoder.cpp

@@ -45,6 +45,8 @@ CborError MessageEncoder::encode(Message * message, uint8_t * data, size_t const
 
 
   cbor_encoder_init(&encoder, data, size, 0);
+
+
   DEBUG_INFO("Encoder init with size %d", size);
   while (current_state != EncoderState::Complete) {
 
@@ -77,7 +79,7 @@ MessageEncoder::EncoderState MessageEncoder::handle_EncodeTag(CborEncoder * enco
   if (cbor_encode_tag(encoder, commandTag) != CborNoError)
     return EncoderState::Error;
 
-  return EncoderState::EncodeParam;
+  return EncoderState::EncodeArray;
 }
 
 MessageEncoder::EncoderState MessageEncoder::handle_EncodeArray(CborEncoder * encoder, CborEncoder * array_encoder)
@@ -138,7 +140,7 @@ CborError MessageEncoder::encodeThingGetIdCmdUp(CborEncoder * array_encoder, Mes
 {
   ThingGetIdCmdUp * thingGetIdCmdUp = (ThingGetIdCmdUp *) message;
   DEBUG_INFO("Encoding thing id: %s", thingGetIdCmdUp->fields.params.thing_id);
-  CHECK_CBOR(cbor_encode_text_string(array_encoder, thingGetIdCmdUp->fields.params.thing_id, THING_ID_SIZE));
+  CHECK_CBOR(cbor_encode_text_stringz(array_encoder, thingGetIdCmdUp->fields.params.thing_id));
   return CborNoError;
 }
 
@@ -152,8 +154,8 @@ CborError MessageEncoder::encodeDeviceBeginCmdUp(CborEncoder * array_encoder, Me
 CborError MessageEncoder::encodeOtaProgressCmdUp(CborEncoder * array_encoder, Message * message)
 {
   OtaProgressCmdUp * ota = (OtaProgressCmdUp *)message;
-  CHECK_CBOR(cbor_encode_text_string(array_encoder, ota->fields.params.id, ID_SIZE));
-  CHECK_CBOR(cbor_encode_text_string(array_encoder, ota->fields.params.state, STATE_SIZE));
+  CHECK_CBOR(cbor_encode_text_stringz(array_encoder, ota->fields.params.id));
+  CHECK_CBOR(cbor_encode_text_stringz(array_encoder, ota->fields.params.state));
   CHECK_CBOR(cbor_encode_uint(array_encoder, ota->fields.params.time));
   CHECK_CBOR(cbor_encode_uint(array_encoder, ota->fields.params.count));
   return CborNoError;

src/models/models.h

@@ -9,16 +9,15 @@
 #define ID_SIZE 32
 
 enum CommandID: uint32_t {
-    GetLastValueCommandId = 66305,
-    SetLastValueCommandId = 66306,
-    GetTimezoneCommandId = 66307,
-    SetTimezoneCommandId = 66308,
-    OTAavailableId = 66309,
-    GetThingIdCommandId = 66304,
     ThingGetIdCmdUpId = 66304,
     ThingGetLastValueCmdUpId = 66816,
     DeviceBeginCmdUpId = 67328,
-    OtaProgressCmdUpId = 66048
+    OtaProgressCmdUpId = 66048,
+    OtaUpdateCmdDownId = 65792,
+    ThingGetIdCmdDownId = 66560,
+    ThingGetLastValueCmdDownId = 67072,
+    TimezoneCommandUpId = 67398,
+    TimezoneCommandDownId = 67428
 };
 
 struct Command {
@@ -97,60 +96,69 @@ union OtaProgressCmdUp {
     } fields;
 };
 
-struct LastValueCommand {
+struct OtaUpdateCmdDownCommand {
     Command command;
 };
 
-union GetLastValueCommand {
+union OtaUpdateCmdDown {
     struct {
-        LastValueCommand lastValueCommand;
+        OtaUpdateCmdDownCommand otaUpdateCmdDownCommand;
         struct {
-            // TODO fill in params
+            char    id[ID_SIZE];
+            char    url[URL_SIZE];
+            uint8_t initialSha256[SHA256_SIZE];
+            uint8_t finalSha256[SHA256_SIZE];
         } params;
     } fields;
 };
 
-union SetLastValueCommand {
+struct ThingGetIdCmdDownCommand {
+    Command command; 
+};
+
+union ThingGetIdCmdDown {
     struct {
-        LastValueCommand lastValueCommand;
+        ThingGetIdCmdDownCommand thingGetIdCmdDownCommand;
         struct {
-            // TODO fill in params
+            char thing_id[THING_ID_SIZE];
         } params;
     } fields;
 };
 
-struct TimezoneCommand {
-    Command command;
+struct ThingGetLastValueCmdDownCommand {
+    Command command; 
 };
 
-union GetTimezoneCommand {
+union ThingGetLastValueCmdDown {
     struct {
-        TimezoneCommand timezoneCommand;
+        ThingGetLastValueCmdDownCommand thingGetLastValueCmdDownCommand;
+        struct {
+            uint8_t * last_values;
+            size_t length;
+        } params;
     } fields;
 };
 
-union SetTimezoneCommand {
+struct TimezoneCommandUpCommand {
+    Command command;
+};
+
+union GetTimezoneCommand {
     struct {
-        TimezoneCommand timezoneCommand;
-        struct {
-            uint32_t offset;
-            uint32_t until;
-        } params;
+        TimezoneCommandUpCommand timezoneCommandUp;
     } fields;
 };
 
-struct OTACommand {
+struct TimezoneCommandDownCommand {
     Command command;
 };
 
-union OTAavailable {
+union SetTimezoneCommand {
     struct {
-        OTACommand otaCommand;
+        TimezoneCommandDownCommand timezoneCommandDown;
         struct {
-            char    id[ID_SIZE];
-            char    url[URL_SIZE];
-            uint8_t initialSha256[SHA256_SIZE];
-            uint8_t finalSha256[SHA256_SIZE];
+            uint32_t offset;
+            uint32_t until;
         } params;
     } fields;
 };