Proposal: fix map and array length

No functional change, some tests need to be modified

Author: facchinm

ArduinoCloudThing.cpp

@@ -56,14 +56,14 @@ int ArduinoCloudThing::poll(uint8_t* data, size_t size) {
     if (diff > 0) {
         CborError err;
         CborEncoder encoder, arrayEncoder;
-         cbor_encoder_init(&encoder, data, size, 0);
+        cbor_encoder_init(&encoder, data, size, 0);
         // create a cbor array containing the property that should be updated.
-        err = cbor_encoder_create_array(&encoder, &arrayEncoder, CborIndefiniteLength);
+        err = cbor_encoder_create_array(&encoder, &arrayEncoder, diff);
         if (err) {
             Serial.println(cbor_error_string(err));
             return -1;
         }
-         for (int i = 0; i < list.size(); i++) {
+        for (int i = 0; i < list.size(); i++) {
             ArduinoCloudPropertyGeneric *p = list.get(i);
             // If a property should be updated and has read permission from the Cloud point of view
             if (p->shouldBeUpdated() && p->canRead()) {

ArduinoCloudThing.h

@@ -166,14 +166,15 @@ class ArduinoCloudProperty : public ArduinoCloudPropertyGeneric
             return;
         }
         CborEncoder mapEncoder;
-        cbor_encoder_create_map(encoder, &mapEncoder, CborIndefiniteLength);
+        cbor_encoder_create_map(encoder, &mapEncoder, 2);
         if (tag != -1) {
             cbor_encode_text_stringz(&mapEncoder, "t");
             cbor_encode_int(&mapEncoder, tag);
         } else {
             cbor_encode_text_stringz(&mapEncoder, "n");
-            cbor_encode_text_stringz(&mapEncoder, name.c_str());
+            cbor_encode_text_string(&mapEncoder, name.c_str(), name.length());
         }
+        cbor_encode_text_stringz(&mapEncoder, "v");
         appendValue(&mapEncoder);
         cbor_encoder_close_container(encoder, &mapEncoder);
         lastUpdated = millis();
@@ -226,37 +227,31 @@ inline bool ArduinoCloudProperty<float>::newData() {
 
 template <>
 inline void ArduinoCloudProperty<int>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_int(mapEncoder, property);
 };
 
 template <>
 inline void ArduinoCloudProperty<bool>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_boolean(mapEncoder, property);
 };
 
 template <>
 inline void ArduinoCloudProperty<float>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_float(mapEncoder, property);
 };
 
 template <>
 inline void ArduinoCloudProperty<String>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_text_stringz(mapEncoder, property.c_str());
 };
 
 template <>
 inline void ArduinoCloudProperty<String*>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_text_stringz(mapEncoder, property->c_str());
 };
 
 template <>
 inline void ArduinoCloudProperty<char*>::appendValue(CborEncoder* mapEncoder) {
-    cbor_encode_text_stringz(mapEncoder, "v");
     cbor_encode_text_stringz(mapEncoder, property);
 };