Fixed leave array

Author: rjtokenring

extras/test/src/test_command_decode.cpp

@@ -111,16 +111,19 @@ SCENARIO("Test the decoding of command messages") {
     THEN("The decode is successful") {
       REQUIRE(err == MessageDecoder::DecoderState::Success);
       REQUIRE(msg->fields.params.length == 13);
-      REQUIRE(msg->fields.params.last_values[0] == (uint8_t)0);
-      REQUIRE(msg->fields.params.last_values[1] == (uint8_t)1);
-      REQUIRE(msg->fields.params.last_values[2] == (uint8_t)2);
-      REQUIRE(msg->fields.params.last_values[3] == (uint8_t)3);
-      REQUIRE(msg->fields.params.last_values[4] == (uint8_t)4);
-      REQUIRE(msg->fields.params.last_values[5] == (uint8_t)5);
-      REQUIRE(msg->fields.params.last_values[6] == (uint8_t)6);
-      REQUIRE(msg->fields.params.last_values[7] == (uint8_t)7);
-      REQUIRE(msg->fields.params.last_values[8] == (uint8_t)8);
-      REQUIRE(msg->fields.params.last_values[9] == (uint8_t)9);
+      REQUIRE(msg->fields.params.last_values[0] == (uint8_t)0x00);
+      REQUIRE(msg->fields.params.last_values[1] == (uint8_t)0x01);
+      REQUIRE(msg->fields.params.last_values[2] == (uint8_t)0x02);
+      REQUIRE(msg->fields.params.last_values[3] == (uint8_t)0x03);
+      REQUIRE(msg->fields.params.last_values[4] == (uint8_t)0x04);
+      REQUIRE(msg->fields.params.last_values[5] == (uint8_t)0x05);
+      REQUIRE(msg->fields.params.last_values[6] == (uint8_t)0x06);
+      REQUIRE(msg->fields.params.last_values[7] == (uint8_t)0x07);
+      REQUIRE(msg->fields.params.last_values[8] == (uint8_t)0x08);
+      REQUIRE(msg->fields.params.last_values[9] == (uint8_t)0x09);
+      REQUIRE(msg->fields.params.last_values[10] == (uint8_t)0x10);
+      REQUIRE(msg->fields.params.last_values[11] == (uint8_t)0x11);
+      REQUIRE(msg->fields.params.last_values[12] == (uint8_t)0x12);
       REQUIRE(genericMessage->id == (uint32_t)67072);
     }
 
@@ -136,16 +139,15 @@ SCENARIO("Test the decoding of command messages") {
     Message * genericMessage = (Message*) msg;
 
     /*
-    
-      DA 00010100                              # tag(65792)
-        84                                     # array(4)
-            6C                                 # text(12)
-              6F74612D69642D3132333435         # "ota-id-12345"
-            78 2F                              # text(47)
-              2F73746F726167652F6F74612F37363132333837363734363132383736313233383736313233383736313233313233 # "/storage/ota/7612387674612876123876123876123123"
-            53                                 # bytes(19)
+      DA 00010100                             # tag(65792)
+        84                                   # array(4)
+            6C                                # text(12)
+              6F74612D69642D3132333435       # "ota-id-12345"
+            75                                # text(21)
+              383736313233383736313233383736313233313233 # "876123876123876123123"
+            53                                # bytes(19)
               33303034616162323735313164623332313264 # "3004aab27511db3212d"
-            50                                 # bytes(16)
+            50                                # bytes(16)
               6A6B6173646B6A686173646B6A687868 # "jkasdkjhasdkjhxh"
     
     */

src/ArduinoIoTCloudTCP.cpp

@@ -302,9 +302,21 @@ void ArduinoIoTCloudTCP::printDebugInfo()
 void ArduinoIoTCloudTCP::decode(){
   GenericCommand * msg = new GenericCommand();
 
+  uint8_t const payloadl[] = {0xDA, 0x00, 0x01, 0x06, 0x00, 0x81, 0x4D, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12};
+
+  int payload_length = sizeof(payloadl) / sizeof(uint8_t);
+  MessageDecoder::decode((Message*) msg, payloadl, payload_length);
+
+  ThingGetLastValueCmdDown * lastValueCommand = (ThingGetLastValueCmdDown*) msg;
+  
+  DEBUG_INFO(">LV is %s", lastValueCommand->fields.params.last_values[10]);
+
+  delete msg;
+  msg = new GenericCommand();
+
   uint8_t const payload[] = {0xDA, 0x00, 0x01, 0x01, 0x00, 0x84, 0x6C, 0x6F, 0x74, 0x61, 0x2D, 0x69, 0x64, 0x2D, 0x31, 0x32, 0x33, 0x34, 0x35, 0x75, 0x38, 0x37, 0x36, 0x31, 0x32, 0x33, 0x38, 0x37, 0x36, 0x31, 0x32, 0x33, 0x38, 0x37, 0x36, 0x31, 0x32, 0x33, 0x31, 0x32, 0x33, 0x53, 0x33, 0x30, 0x30, 0x34, 0x61, 0x61, 0x62, 0x32, 0x37, 0x35, 0x31, 0x31, 0x64, 0x62, 0x33, 0x32, 0x31, 0x32, 0x64, 0x50, 0x6A, 0x6B, 0x61, 0x73, 0x64, 0x6B, 0x6A, 0x68, 0x61, 0x73, 0x64, 0x6B, 0x6A, 0x68, 0x78, 0x68};
 
-  int payload_length = sizeof(payload) / sizeof(uint8_t);
+  payload_length = sizeof(payload) / sizeof(uint8_t);
   MessageDecoder::DecoderState err1 = MessageDecoder::decode((Message*) msg, payload, payload_length);
 
   DEBUG_INFO(">Message OTA id is %d", msg->command);
@@ -315,7 +327,6 @@ void ArduinoIoTCloudTCP::decode(){
   DEBUG_INFO(">Command status %d", static_cast<int>(err1));
 
   delete msg;
-
 }
 
 void ArduinoIoTCloudTCP::encode(){

src/cbor/MessageDecoder.h

@@ -66,7 +66,7 @@ class MessageDecoder
 
   static ArrayParserState handle_EnterArray(CborValue * main_iter, CborValue * array_iter);
   static ArrayParserState handle_Param(CborValue * param, Message * message);
-  static ArrayParserState handle_LeaveArray();
+  static ArrayParserState handle_LeaveArray(CborValue * main_iter, CborValue * array_iter);
 
   static bool   ifNumericConvertToDouble(CborValue * value_iter, double * numeric_val);
   static double convertCborHalfFloatToDouble(uint16_t const half_val);