summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-01-09 10:39:27 +0100
committerDaniel Friesel <derf@finalrewind.org>2019-01-09 10:39:27 +0100
commit27e97cca23e8222b147e2070282bcdb14e3bddfc (patch)
tree409b40d40377cf36eca926228732c34f8600593c /src/app
parent2d4375cab1f2a216d060db3197f62379cd9f09a9 (diff)
import binn serialization format
Diffstat (limited to 'src/app')
-rw-r--r--src/app/prototest/Makefile.inc5
-rw-r--r--src/app/prototest/main.cc17
2 files changed, 8 insertions, 14 deletions
diff --git a/src/app/prototest/Makefile.inc b/src/app/prototest/Makefile.inc
index 7acd589..957591a 100644
--- a/src/app/prototest/Makefile.inc
+++ b/src/app/prototest/Makefile.inc
@@ -21,6 +21,11 @@ ifeq (${prototest_arduinojson}, 1)
COMMON_FLAGS += -DPROTOTEST_ARDUINOJSON
endif
+ifeq (${prototest_binn}, 1)
+ COMMON_FLAGS += -DPROTOTEST_BINN
+ CXX_TARGETS += src/lib/binn.cc
+endif
+
ifeq (${prototest_capnproto_c}, 1)
COMMON_FLAGS += -DPROTOTEST_CAPNPROTO_C
CXX_TARGETS += src/app/prototest/capnp_c_bench.capnp.cc
diff --git a/src/app/prototest/main.cc b/src/app/prototest/main.cc
index 5e048ec..d470d59 100644
--- a/src/app/prototest/main.cc
+++ b/src/app/prototest/main.cc
@@ -9,6 +9,9 @@
#ifdef PROTOTEST_ARDUINOJSON
#include "lib/ArduinoJson.h"
#endif
+#ifdef PROTOTEST_BINN
+#include "lib/binn.h"
+#endif
#ifdef PROTOTEST_CAPNPROTO_C
#include <capnp_c.h>
#include "capnp_c_bench.capnp.h"
@@ -43,20 +46,6 @@
#include "prototest_global.cc.inc"
#endif
-// TODOs
-//
-// Code -> JSON
-// Code -> XDR
-// Code -> MsgPack
-// Code -> ProtoBuf
-// Code -> CBOR
-//
-// JSON -> Code/Data
-// XDR -> Code/Data
-// MsgPack -> Code/Data
-// ProtoBuf -> Code/Data
-// CBOR -> Code/Data
-
void loop(void)
{
//static uint16_t ts = 0;