Fixed test and ota logic

Author: rjtokenring

src/ArduinoIoTCloudTCP.cpp

@@ -300,40 +300,22 @@ void ArduinoIoTCloudTCP::printDebugInfo()
 }
 
 void ArduinoIoTCloudTCP::decode(){
-  GenericCommand * message = new GenericCommand();
-
-  uint8_t const payload[] = {0xDA, 0x00, 0x01, 0x03, 0x00, 0x81, 0x78, 0x24, 0x65, 0x34, 0x34, 0x39, 0x34, 0x64, 0x35, 0x35, 0x2D, 0x38, 0x37, 0x32, 0x61, 0x2D, 0x34, 0x66, 0x64, 0x32, 0x2D, 0x39, 0x36, 0x34, 0x36, 0x2D, 0x39, 0x32, 0x66, 0x38, 0x37, 0x39, 0x34, 0x39, 0x33, 0x39, 0x34, 0x63};
+  GenericCommand * 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);
-  MessageDecoder::DecoderState err1 = MessageDecoder::decode((Message*) message, payload, payload_length);
+  MessageDecoder::DecoderState err1 = MessageDecoder::decode((Message*) msg, payload, payload_length);
 
-  DEBUG_INFO(">Message THING id is %d", message->command);
+  DEBUG_INFO(">Message OTA id is %d", msg->command);
 
-  ThingGetIdCmdDown * thingCommand = (ThingGetIdCmdDown*) message;
- // DEBUG_INFO("Thing id is %s", thingCommand->fields.params.thing_id);
+  OtaUpdateCmdDown * otaCommand = (OtaUpdateCmdDown*) msg;
+  DEBUG_INFO(">URL is %s", otaCommand->fields.params.url);
+  DEBUG_INFO(">ID is %s", otaCommand->fields.params.id);
   DEBUG_INFO(">Command status %d", static_cast<int>(err1));
-  DEBUG_INFO(">Command status %d", static_cast<int>(MessageDecoder::DecoderState::Success));
-  DEBUG_INFO(">Command status %d", static_cast<int>(MessageDecoder::DecoderState::MessageNotSupported));
-
-  delete message;
 
-  /*
-  uint8_t const payloadLV[] = {0xDA, 0x00, 0x01, 0x06, 0x00, 0x81, 0x4D, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12};
-  payload_length = sizeof(payloadLV) / sizeof(uint8_t);
-  MessageDecoder::DecoderState err = MessageDecoder::decode((Message*) message, payloadLV, payload_length);
-
-  DEBUG_INFO("Message LV id is %d", message->command);
-  DEBUG_INFO("Command status %d", static_cast<int>(err));
-  DEBUG_INFO("Command status %d", static_cast<int>(MessageDecoder::DecoderState::Success));
-  ThingGetLastValueCmdDown * lv = (ThingGetLastValueCmdDown*) message;
-  DEBUG_INFO("LV payload (size: %d)", lv->fields.params.length);
-  for (int i = 0; i < lv->fields.params.length; i++) {
-    DEBUG_INFO("%02X", lv->fields.params.last_values[i]);
-  }
+  delete msg;
 
-  delete lv->fields.params.last_values;
-  delete lv;
-  */
 }
 
 void ArduinoIoTCloudTCP::encode(){

src/cbor/MessageDecoder.cpp

@@ -130,11 +130,11 @@ MessageDecoder::ArrayParserState MessageDecoder::decodeThingGetIdCmdDown(CborVal
   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))) {
-    return ArrayParserState::LeaveArray;
-  } else {
+  if (!copyCBORStringToArray(param, thingCommand->fields.params.thing_id, sizeof(thingCommand->fields.params.thing_id))) {
     return ArrayParserState::Error;
   }
+
+  return ArrayParserState::LeaveArray;
 }
 
 MessageDecoder::ArrayParserState MessageDecoder::decodeTimezoneCommandDown(CborValue * param, Message * message) {
@@ -182,39 +182,31 @@ MessageDecoder::ArrayParserState MessageDecoder::decodeOtaUpdateCmdDown(CborValu
   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))) {
-    return ArrayParserState::LeaveArray;
-  } else {
+  if (!copyCBORStringToArray(param, ota->fields.params.id, sizeof(ota->fields.params.id))) {
     return ArrayParserState::Error;
   }
 
   if (cbor_value_advance(param) != CborNoError) {
     return ArrayParserState::Error;
   }
 
-  if (copyCBORStringToArray(param, ota->fields.params.url, sizeof(ota->fields.params.url))) {
-    return ArrayParserState::LeaveArray;
-  } else {
+  if (!copyCBORStringToArray(param, ota->fields.params.url, sizeof(ota->fields.params.url))) {
     return ArrayParserState::Error;
   }
 
   if (cbor_value_advance(param) != CborNoError) {
     return ArrayParserState::Error;
   }
 
-  if (copyCBORByteToArray(param, ota->fields.params.initialSha256, sizeof(ota->fields.params.initialSha256))) {
-    return ArrayParserState::LeaveArray;
-  } else {
+  if (!copyCBORByteToArray(param, ota->fields.params.initialSha256, sizeof(ota->fields.params.initialSha256))) {
     return ArrayParserState::Error;
   }
 
   if (cbor_value_advance(param) != CborNoError) {
     return ArrayParserState::Error;
   }
 
-  if (copyCBORByteToArray(param, ota->fields.params.finalSha256, sizeof(ota->fields.params.finalSha256))) {
-    return ArrayParserState::LeaveArray;
-  } else {
+  if (!copyCBORByteToArray(param, ota->fields.params.finalSha256, sizeof(ota->fields.params.finalSha256))) {
     return ArrayParserState::Error;
   }