Change CBOR library (this one uses maps)

decode() needs to be rewritten

Author: facchinm

ArduinoCloudThing.cpp

@@ -84,17 +84,20 @@ bool ArduinoCloudThing::connect() {
     return false;
 }
 
-void ArduinoCloudThing::publish(CborDynamicOutput& output) {
+void ArduinoCloudThing::publish(CborObject& object) {
 
     bool retained = false;
 
-    unsigned char *buf = output.getData();
+    uint8_t data[1024];
+    size_t size = object.encode(data, sizeof(data));
 
 #ifdef TESTING_PROTOCOL
-    decode(buf, output.getSize());
+    decode(data, size);
 #endif
 
-    client->publish(GENERAL_TOPIC, (const char*)buf, output.getSize());
+#ifndef TESTING_PROTOCOL
+    client->publish(GENERAL_TOPIC, (const char*)data, size);
+#endif
 
     for (int i = 0; i < list.size(); i++) {
         ArduinoCloudPropertyGeneric *p = list.get(i);
@@ -115,11 +118,13 @@ int ArduinoCloudThing::poll() {
 
     // check if backing storage and cloud has diverged
     int diff = 0;
-    CborDynamicOutput output;
-    diff = checkNewData(output);
+
+    diff = checkNewData();
     if (diff > 0) {
-        compress(output, diff);
-        publish(output);
+        CborBuffer buffer(1024);
+        CborObject object = CborObject(buffer);
+        compress(object, buffer);
+        publish(object);
     }
 
 #ifdef DEBUG_MEMORY
@@ -129,21 +134,23 @@ int ArduinoCloudThing::poll() {
     return diff;
 }
 
-void ArduinoCloudThing::compress(CborDynamicOutput& output, int howMany) {
+void ArduinoCloudThing::compress(CborObject& object, CborBuffer& buffer) {
 
-    CborWriter writer(output);
-
-    writer.writeArray(howMany);
+    CborArray array = CborArray(buffer);
 
     for (int i = 0; i < list.size(); i++) {
         ArduinoCloudPropertyGeneric *p = list.get(i);
         if (p->newData()) {
-            p->append(writer);
+            CborObject child = CborObject(buffer);
+            p->append(child);
+            CborVariant variant = CborVariant(buffer, child);
+            array.add(variant);
         }
     }
+    object.set("a", array);
 }
 
-int ArduinoCloudThing::checkNewData(CborDynamicOutput& output) {
+int ArduinoCloudThing::checkNewData() {
     int counter = 0;
     for (int i = 0; i < list.size(); i++) {
         ArduinoCloudPropertyGeneric *p = list.get(i);
@@ -193,14 +200,23 @@ void ArduinoCloudThing::callback(MQTTClient *client, char topic[], char bytes[],
 }
 
 void ArduinoCloudThing::decode(uint8_t * payload, size_t length) {
-    CborInput input(payload, length);
+    /*
+    CborBuffer buffer(200);
+    CborVariant variant = buffer.decode(payload, length);
+    CborArray array = variant.asArray();
+
+    CborVariant obj = array.get(0);
+    if (!obj.isValid()) {
+        return;
+    }
+    if (obj.isString()) {
 
-    CborReader reader(input);
-    CborPropertyListener listener(&list);
-    reader.SetListener(listener);
-    reader.Run();
+    }
+    */
 }
 
+/*
+
 void CborPropertyListener::OnInteger(int32_t value) {
     if (currentListIndex < 0) {
         return;
@@ -267,4 +283,6 @@ void CborPropertyListener::OnSpecial(uint32_t code) {
 }
 
 void CborPropertyListener::OnError(const char *error) {
-}
+}
+
+*/

ArduinoCloudThing.h

@@ -5,8 +5,7 @@
 #include <Stream.h>
 #include "lib/MQTT/src/MQTTClient.h"
 #include "lib/LinkedList/LinkedList.h"
-#include "lib/CBOR/CborDecoder.h"
-#include "lib/CBOR/CborEncoder.h"
+#include "lib/ArduinoCbor/src/ArduinoCbor.h"
 
 #ifndef MQTT_BUFFER_SIZE
 #define MQTT_BUFFER_SIZE 256
@@ -33,7 +32,7 @@ enum boolStatus {
 class ArduinoCloudPropertyGeneric
 {
 public:
-    virtual void append(CborWriter &cbor) = 0;
+    virtual void append(CborObject& object) = 0;
     virtual String& getName() = 0;
     virtual void setName(String _name) = 0;
     virtual void setPermission(permissionType _permission) = 0;
@@ -87,14 +86,12 @@ class ArduinoCloudProperty : public ArduinoCloudPropertyGeneric
         return permission;
     }
 
-    void appendValue(CborWriter &cbor);
+    void appendValue(CborObject &cbor);
 
-    void append(CborWriter &cbor) {
-        cbor.writeArray(4);
-        cbor.writeTag(tag);
-        cbor.writeString(name);
+    void append(CborObject &cbor) {
+        cbor.set("n", name.c_str());
         appendValue(cbor);
-        cbor.writeSpecial(permission);
+        cbor.set("p", permission);
     }
 
     bool newData() {
@@ -115,29 +112,28 @@ class ArduinoCloudProperty : public ArduinoCloudPropertyGeneric
 };
 
 template <>
-inline void ArduinoCloudProperty<int>::appendValue(CborWriter &cbor) {
-    cbor.writeInt(property);
+inline void ArduinoCloudProperty<int>::appendValue(CborObject &cbor) {
+    cbor.set("i", property);
 };
 
 template <>
-inline void ArduinoCloudProperty<bool>::appendValue(CborWriter &cbor) {
-    //cbor.writeBoolean(property);
-    cbor.writeInt((int)property);
+inline void ArduinoCloudProperty<bool>::appendValue(CborObject &cbor) {
+    cbor.set("b", property);
 };
 
 template <>
-inline void ArduinoCloudProperty<float>::appendValue(CborWriter &cbor) {
-    //cbor.writeFloat(property);
+inline void ArduinoCloudProperty<float>::appendValue(CborObject &cbor) {
+    cbor.set("f", property);
 };
 
 template <>
-inline void ArduinoCloudProperty<String>::appendValue(CborWriter &cbor) {
-    cbor.writeString(property);
+inline void ArduinoCloudProperty<String>::appendValue(CborObject &cbor) {
+    cbor.set("s", property.c_str());
 };
 
 template <>
-inline void ArduinoCloudProperty<char*>::appendValue(CborWriter &cbor) {
-    cbor.writeString(property);
+inline void ArduinoCloudProperty<char*>::appendValue(CborObject &cbor) {
+    cbor.set("s", property);
 };
 
 #ifndef addProperty
@@ -159,11 +155,11 @@ class ArduinoCloudThing {
 private:
     static void callback(MQTTClient *client, char topic[], char bytes[], int length);
     bool connect();
-    void publish(CborDynamicOutput& output);
+    void publish(CborObject& object);
 
     void update();
-    int checkNewData(CborDynamicOutput& output);
-    void compress(CborDynamicOutput& output, int howMany);
+    int checkNewData();
+    void compress(CborObject& object, CborBuffer& buffer);
     void decode(uint8_t * payload, size_t length);
 
     bool exists(String &name);
@@ -176,22 +172,4 @@ class ArduinoCloudThing {
     MQTTClient* client;
 };
 
-class CborPropertyListener : public CborListener {
-  public:
-    CborPropertyListener(LinkedList<ArduinoCloudPropertyGeneric*> *_list) : list(_list) {}
-    void OnInteger(int32_t value);
-    void OnBytes(unsigned char *data, unsigned int size);
-    void OnString(String &str);
-    void OnArray(unsigned int size);
-    void OnMap(unsigned int size) ;
-    void OnTag(uint32_t tag);
-    void OnSpecial(uint32_t code);
-    void OnError(const char *error);
-    LinkedList<ArduinoCloudPropertyGeneric*> *list;
-    int currentListIndex;
-    bool justStarted = true;
-    int list_size = 0;
-    bool newElement = false;
-};
-
 #endif

lib/ArduinoCbor/.gitignore

@@ -0,0 +1,2 @@
+build
+gtest

lib/ArduinoCbor/README.md

@@ -0,0 +1,7 @@
+# ArduinoCbor
+
+ArduinoCbor is a C++ library to handle CBOR data structures.
+CBOR is a binary format based on the JSON data model.
+Internal the [cn-cbor](https://github.com/cabo/cn-cbor) C library is used.
+
+## Examples

lib/ArduinoCbor/examples/simple/simple.ino

@@ -0,0 +1,37 @@
+#include <ArduinoCbor.h>
+
+void setup() {
+  Serial.begin(115200);
+
+  while(!Serial) {
+    delay(10);
+  }
+}
+
+
+void loop() {
+  CborBuffer buffer(200);
+  CborObject object = CborObject(buffer);
+
+  object.set("string", "value");
+  object.set("integer", -1234);
+  
+  CborObject child = CborObject(buffer);
+  child.set("key", "value");
+  object.set("object", child);
+  
+  CborArray array = CborArray(buffer);
+  array.add(-1234);
+  object.set("array", array);
+
+  Serial.print("string value: ");
+  Serial.println(object.get("string").asString());
+
+  Serial.print("integer value: ");
+  Serial.println(object.get("integer").asInteger());
+
+  Serial.print("child string value: ");
+  Serial.println(object.get("object").asObject().get("key").asString());
+
+  delay(1000);
+}

lib/ArduinoCbor/library.json

@@ -0,0 +1,10 @@
+{
+  "name": "ArduinoCbor",
+  "keywords": "cbor",
+  "description": "CBOR library for Arduino",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bergos/ArduinoCbor.git"
+  },
+  "frameworks": "arduino"
+}

lib/ArduinoCbor/library.properties

@@ -0,0 +1,9 @@
+name=ArduinoCbor
+version=0.0.1
+author=Thomas Bergwinkl <[email protected]> (https://www.bergnet.org/people/bergi/card#me)
+maintainer=Thomas Bergwinkl <[email protected]> (https://www.bergnet.org/people/bergi/card#me)
+sentence=CBOR library for Arduino
+paragraph=CBOR library for Arduino
+category=Other
+url=https://github.com/bergos/ArduinoCbor
+architectures=*

lib/ArduinoCbor/makefile

@@ -0,0 +1,37 @@
+OBJS += \
+  build/cn-cbor.o \
+  build/cn-create.o \
+  build/cn-encoder.o \
+  build/cn-error.o \
+  build/cn-get.o \
+  build/CborArray.o \
+  build/CborBuffer.o \
+  build/CborObject.o \
+  build/CborVariant.o \
+  build/test.o 
+
+LIBS += \
+  -lgtest \
+  -lpthread
+
+build/%.o: src/cn-cbor/%.c
+	@mkdir -p build
+	gcc $(CCFLAGS) -c -o "$@" "$<" -I src
+
+build/%.o: src/%.cpp
+	@mkdir -p build
+	g++ $(CCFLAGS) -c -o "$@" "$<"
+
+build/%.o: extra/test/%.cpp
+	@mkdir -p build
+	g++ $(CCFLAGS) -c -o "$@" "$<" -I src
+
+all: test
+
+test: $(OBJS)
+	g++ -o gtest $(OBJS) $(LIBS)
+	./gtest
+
+clean:
+	@rm -rf build
+	@rm -f test

lib/ArduinoCbor/src/ArduinoCbor.h

@@ -0,0 +1,22 @@
+#ifndef ARDUINO_CBOR_H_
+#define ARDUINO_CBOR_H_
+
+#define USE_CBOR_CONTEXT
+
+#include "cn-cbor/cn-cbor.h"
+
+#ifndef CBOR_INT_T
+#define CBOR_INT_T long
+#endif
+
+class CborArray;
+class CborBuffer;
+class CborObject;
+class CborVariant;
+
+#include "CborArray.h"
+#include "CborBuffer.h"
+#include "CborObject.h"
+#include "CborVariant.h"
+
+#endif // ARDUINO_CBOR_H_

lib/ArduinoCbor/src/CborArray.cpp

@@ -0,0 +1,32 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "ArduinoCbor.h"
+
+CborArray::CborArray(CborBuffer& buffer, cn_cbor* raw) : buffer(buffer) {
+  this->raw = raw;
+
+  if (raw == 0) {
+    cn_cbor_errback err;
+
+    this->raw = cn_cbor_array_create(&buffer.context, &err);  
+  }
+}
+
+CborVariant CborArray::get(int index) {
+  return CborVariant(buffer, cn_cbor_index(raw, index));
+}
+
+void CborArray::add(CborVariant value) {
+  cn_cbor_errback err;
+
+  cn_cbor_array_append(raw, value.raw, &err);
+}
+
+void CborArray::add(const char* value) {
+  add(CborVariant(buffer, value));
+}
+
+void CborArray::add(CBOR_INT_T value) {
+  add(CborVariant(buffer, value));
+}