From 93de42e09b459dadf4a9b5b5093d4446459f6e36 Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sun, 17 Jun 2018 00:25:40 +0200 Subject: [PATCH] payload encoder (experimental) --- src/globals.h | 6 +++++- src/main.cpp | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/globals.h b/src/globals.h index 262fc4c8..be2a175e 100644 --- a/src/globals.h +++ b/src/globals.h @@ -45,6 +45,7 @@ extern gpsStatus_t gps_status; // struct for storing gps data extern TinyGPSPlus gps; // Make TinyGPS++ instance globally availabe #endif +/* // payload encoder #if (PAYLOAD_ENCODER == 1) extern TTNplain payload; @@ -54,4 +55,7 @@ extern TTNserialized payload; extern CayenneLPP payload; #else #error "No valid payload converter defined" -#endif \ No newline at end of file +#endif +*/ + +extern TTNplain payload; \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 025365dd..277a40ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -70,6 +70,7 @@ portMUX_TYPE timerMux = std::set macs; // associative container holds total of unique MAC // adress hashes (Wifi + BLE) +/* // initialize payload encoder #if (PAYLOAD_ENCODER == 1) TTNplain payload(PAYLOAD_BUFFER_SIZE); @@ -80,6 +81,10 @@ CayenneLPP payload(PAYLOAD_BUFFER_SIZE); #else #error "No valid payload converter defined" #endif +*/ + +TTNplain payload(PAYLOAD_BUFFER_SIZE); + // this variables will be changed in the ISR, and read in main loop static volatile int ButtonPressedIRQ = 0, DisplayTimerIRQ = 0,