From 27e97cca23e8222b147e2070282bcdb14e3bddfc Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 9 Jan 2019 10:39:27 +0100 Subject: import binn serialization format --- src/app/prototest/Makefile.inc | 5 +++++ src/app/prototest/main.cc | 17 +++-------------- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'src/app') 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 #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; -- cgit v1.2.3