Refactoring

Author: mirkokurt

src/ArduinoIoTCloudTCP.cpp

@@ -318,11 +318,14 @@ void ArduinoIoTCloudTCP::decode(){
 
 void ArduinoIoTCloudTCP::encode(){
   ThingGetIdCmdUp * command = new ThingGetIdCmdUp();
+  String s = "thing_id";
+  strcpy(command->fields.params.thing_id, s.c_str());
 
+  Message * message = (Message*) command;
+  message->id = CommandID(66304);
   int bytes_encoded = 0;
-  uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
-  DEBUG_INFO("Encoding");
-  if (MessageEncoder::encode((Message*) command, data, sizeof(data), bytes_encoded) == CborNoError)
+  uint8_t data[1024];
+  if (MessageEncoder::encode(message, data, sizeof(data), bytes_encoded) == CborNoError)
     if (bytes_encoded > 0)
     {
       DEBUG_INFO("Data are %s", data);

src/cbor/MessageEncoder.cpp

@@ -43,8 +43,9 @@ CborError MessageEncoder::encode(Message * message, uint8_t * data, size_t const
   CborEncoder encoder;
   CborEncoder arrayEncoder;
 
-  cbor_encoder_init(&encoder, data, size, 0);
 
+  cbor_encoder_init(&encoder, data, size, 0);
+  DEBUG_INFO("Encoder init with size %d", size);
   while (current_state != EncoderState::Complete) {
 
     switch (current_state) {
@@ -71,6 +72,7 @@ CborError MessageEncoder::encode(Message * message, uint8_t * data, size_t const
 
 MessageEncoder::EncoderState MessageEncoder::handle_EncodeTag(CborEncoder * encoder, Message * message,  uint8_t * data)
 {
+  DEBUG_INFO("Encode tag");
   CborTag commandTag = (uint64_t) message->id;
   if (cbor_encode_tag(encoder, commandTag) != CborNoError)
     return EncoderState::Error;
@@ -80,6 +82,7 @@ MessageEncoder::EncoderState MessageEncoder::handle_EncodeTag(CborEncoder * enco
 
 MessageEncoder::EncoderState MessageEncoder::handle_EncodeArray(CborEncoder * encoder, CborEncoder * array_encoder)
 {
+  DEBUG_INFO("Start array");
   if (cbor_encoder_create_array(encoder, array_encoder, CborIndefiniteLength) != CborNoError)
     return EncoderState::Error;
 
@@ -88,11 +91,14 @@ MessageEncoder::EncoderState MessageEncoder::handle_EncodeArray(CborEncoder * en
 
 MessageEncoder::EncoderState MessageEncoder::handle_EncodeParam(CborEncoder * encoder, CborEncoder * array_encoder, Message * message, uint8_t * data, size_t const size)
 {
+  DEBUG_INFO("Encode param");
   CborError error = CborNoError;
   // Switch case on the message id
+  DEBUG_INFO("message id is %d", message->id);
   switch (message->id)
   {
   case CommandID::ThingGetIdCmdUpId:
+    DEBUG_INFO("Encode thing id up");
     error = MessageEncoder::encodeThingGetIdCmdUp(array_encoder, message);
     break;
   case CommandID::ThingGetLastValueCmdUpId:
@@ -106,68 +112,51 @@ MessageEncoder::EncoderState MessageEncoder::handle_EncodeParam(CborEncoder * en
   default:
     return EncoderState::MessageNotSupported;
   }
-
-  if (error != CborNoError)
+  DEBUG_INFO("Check error");
+  if (error != CborNoError) {
+    DEBUG_INFO("error is %d", error);
     return EncoderState::Error;
-
+  }
+    
   return EncoderState::CloseArray;
 }
 
 MessageEncoder::EncoderState MessageEncoder::handle_CloseArray(CborEncoder * encoder, CborEncoder * array_encoder)
 {
-  CborError error = cbor_encoder_close_container(encoder, array_encoder);
-  if (cbor_encoder_close_container(encoder, array_encoder))
+  DEBUG_INFO("Close array");
+  if (cbor_encoder_close_container(encoder, array_encoder) != CborNoError) {
+    DEBUG_INFO("Error closing array");
     return EncoderState::Error;
-
+  }
+    
+  DEBUG_INFO("After close array");
   return EncoderState::Complete;
 }
 
 // Message specific encoders
 CborError MessageEncoder::encodeThingGetIdCmdUp(CborEncoder * array_encoder, Message * message)
 {
   ThingGetIdCmdUp * thingGetIdCmdUp = (ThingGetIdCmdUp *) message;
-  // Encode the thing id
-  CborError error = CborNoError;
-  error = cbor_encode_text_string(array_encoder, thingGetIdCmdUp->fields.params.thing_id, THING_ID_SIZE);
-
-  return error;
+  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));
+  return CborNoError;
 }
 
 CborError MessageEncoder::encodeDeviceBeginCmdUp(CborEncoder * array_encoder, Message * message)
 {
   DeviceBeginCmdUp * deviceBeginCmdUp = (DeviceBeginCmdUp *) message;
-  // Encode the sha
-  CborError error = CborNoError;
-  error = cbor_encode_byte_string(array_encoder, deviceBeginCmdUp->fields.params.sha, SHA256_SIZE);
-  
-  return error;
+  CHECK_CBOR(cbor_encode_byte_string(array_encoder, deviceBeginCmdUp->fields.params.sha, SHA256_SIZE));
+  return CborNoError;
 }
 
 CborError MessageEncoder::encodeOtaProgressCmdUp(CborEncoder * array_encoder, Message * message)
 {
   OtaProgressCmdUp * ota = (OtaProgressCmdUp *)message;
-  // Encode the url
-  CborError error = CborNoError;
-  error = cbor_encode_text_string(array_encoder, ota->fields.params.id, ID_SIZE);
-  if (error != CborNoError)
-    return error;
-
-  // Encode the state
-  error = cbor_encode_text_string(array_encoder, ota->fields.params.state, STATE_SIZE);
-  if (error != CborNoError)
-    return error;
-
-  // Encode the time
-  error = cbor_encode_uint(array_encoder, ota->fields.params.time);
-  if (error != CborNoError)
-    return error;
-
-  // Encode the count
-  error = cbor_encode_uint(array_encoder, ota->fields.params.count);
-  if (error != CborNoError)
-    return error;
-
-  return error;
+  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_uint(array_encoder, ota->fields.params.time));
+  CHECK_CBOR(cbor_encode_uint(array_encoder, ota->fields.params.count));
+  return CborNoError;
 }