Fix encoding

Author: facchinm

ArduinoCloudThing.cpp

@@ -22,15 +22,17 @@ static void utox8(uint32_t val, char* s) {
 #endif
 
 #ifdef USE_ARDUINO_CLOUD
-
 char MQTT_SERVER[] = "10.130.22.94";
 int MQTT_PORT = 1883;
 char GENERAL_TOPIC[] = "/main";
 char MQTT_USER[] = "";
 char MQTT_PASSWORD[] = "";
 char LWT_TOPIC[] = "";
 char LWT_MESSAGE[] = "";
+#endif
 
+#ifdef ARDUINO_ARCH_MRAA
+#define Serial DebugSerial
 #endif
 
 ArduinoCloudThing::ArduinoCloudThing() {
@@ -84,7 +86,7 @@ bool ArduinoCloudThing::connect() {
     return false;
 }
 
-void ArduinoCloudThing::publish(CborObject& object) {
+void ArduinoCloudThing::publish(CborArray& object) {
 
     bool retained = false;
 
@@ -122,7 +124,7 @@ int ArduinoCloudThing::poll() {
     diff = checkNewData();
     if (diff > 0) {
         CborBuffer buffer(1024);
-        CborObject object = CborObject(buffer);
+        CborArray object = CborArray(buffer);
         compress(object, buffer);
         publish(object);
     }
@@ -134,20 +136,17 @@ int ArduinoCloudThing::poll() {
     return diff;
 }
 
-void ArduinoCloudThing::compress(CborObject& object, CborBuffer& buffer) {
-
-    CborArray array = CborArray(buffer);
+void ArduinoCloudThing::compress(CborArray& object, CborBuffer& buffer) {
 
     for (int i = 0; i < list.size(); i++) {
         ArduinoCloudPropertyGeneric *p = list.get(i);
         if (p->shouldBeUpdated()) {
             CborObject child = CborObject(buffer);
             p->append(child);
             CborVariant variant = CborVariant(buffer, child);
-            array.add(variant);
+            object.add(variant);
         }
     }
-    object.set("a", array);
 }
 
 int ArduinoCloudThing::checkNewData() {
@@ -205,6 +204,7 @@ void ArduinoCloudThing::callback(MQTTClient *client, char topic[], char bytes[],
 void ArduinoCloudThing::decode(uint8_t * payload, size_t length) {
     CborBuffer buffer(200);
     CborVariant total = buffer.decode(payload, length);
+
     CborArray array = total.asArray();
 
     for (int i=0; ;i++) {
@@ -214,6 +214,7 @@ void ArduinoCloudThing::decode(uint8_t * payload, size_t length) {
             break;
         }
 
+
         CborObject object = variant.asObject();
 
         String name = "";
@@ -227,15 +228,13 @@ void ArduinoCloudThing::decode(uint8_t * payload, size_t length) {
                     break;
                 }
                 if (idx == list.size()) {
-                    Serial.println("Property not found, skipping");
                     currentListIndex = -1;
                 }
             }
         }
 
         if (object.get("t").isValid()) {
             int tag = object.get("t").asInteger();
-
             if (name != "") {
                 list.get(currentListIndex)->setTag(tag);
             } else {
@@ -281,79 +280,9 @@ void ArduinoCloudThing::decode(uint8_t * payload, size_t length) {
 
         if (list.get(currentListIndex)->newData()) {
             // call onUpdate()
-            list.get(currentListIndex)->callback();
-        }
-    }
-}
-
-/*
-
-void CborPropertyListener::OnInteger(int32_t value) {
-    if (currentListIndex < 0) {
-        return;
-    }
-    reinterpret_cast<ArduinoCloudProperty<int>*>(list->get(currentListIndex))->write(value);
-}
-
-void CborPropertyListener::OnBytes(unsigned char *data, unsigned int size) {
-    printf("bytes with size: %d", size);
-}
-
-void CborPropertyListener::OnString(String &str) {
-    // if tag arrived, search a string with the same name in the list
-    if (newElement == true) {
-        newElement = false;
-        for (int i = 0; i < list->size(); i++) {
-            ArduinoCloudPropertyGeneric *p = list->get(i);
-            if (p->getName() == str) {
-                currentListIndex = i;
-                break;
-            }
-            if (i == list->size()) {
-                Serial.println("Property not found, skipping");
-                currentListIndex = -1;
+            if (list.get(currentListIndex)->callback != NULL) {
+                list.get(currentListIndex)->callback();
             }
         }
-    } else {
-        if (currentListIndex < 0) {
-            return;
-        }
-        reinterpret_cast<ArduinoCloudProperty<String>*>(list->get(currentListIndex))->write(str);
-    }
-}
-
-void CborPropertyListener::OnArray(unsigned int size) {
-
-    // prepare for new properties to arrive
-    if (justStarted == true) {
-        list_size = size;
-        justStarted = false;
-    }
-}
-
-void CborPropertyListener::OnMap(unsigned int size) {
-}
-
-void CborPropertyListener::OnTag(uint32_t tag) {
-     newElement = true;
-     list_size--;
-     if (list_size < 0) {
-        Serial.println("problem, we got more properties than advertised");
-     }
-}
-
-void CborPropertyListener::OnSpecial(uint32_t code) {
-
-    if (currentListIndex < 0) {
-        return;
-    }
-    if (list->get(currentListIndex)->getPermission() != code) {
-        Serial.println("permission changed, updating");
-        list->get(currentListIndex)->setPermission((permissionType)code);
     }
-}
-
-void CborPropertyListener::OnError(const char *error) {
-}
-
-*/
+}

ArduinoCloudThing.h

@@ -198,11 +198,11 @@ class ArduinoCloudThing {
 private:
     static void callback(MQTTClient *client, char topic[], char bytes[], int length);
     bool connect();
-    void publish(CborObject& object);
+    void publish(CborArray& object);
 
     void update();
     int checkNewData();
-    void compress(CborObject& object, CborBuffer& buffer);
+    void compress(CborArray& object, CborBuffer& buffer);
     void decode(uint8_t * payload, size_t length);
 
     bool exists(String &name);

lib/ArduinoCbor/src/CborArray.cpp

@@ -30,3 +30,7 @@ void CborArray::add(const char* value) {
 void CborArray::add(CBOR_INT_T value) {
   add(CborVariant(buffer, value));
 }
+
+size_t CborArray::encode(uint8_t* data, size_t size) {
+  return cn_cbor_encoder_write(data, 0, size, raw);
+}

lib/ArduinoCbor/src/CborArray.h

@@ -15,6 +15,8 @@ class CborArray {
   void add(const char* value);
   void add(CBOR_INT_T value);
 
+  size_t encode(uint8_t* data, size_t size);
+
  protected:
   CborBuffer& buffer;
   cn_cbor* raw;