DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payload encoder (experimental)

Browse Source
This commit is contained in:
Klaus K Wilting 2018-06-17 00:25:40 +02:00
parent 095334a2a6
commit 93de42e09b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/globals.h
View File

@ -45,6 +45,7 @@ extern gpsStatus_t gps_status; // struct for storing gps data
extern TinyGPSPlus gps; // Make TinyGPS++ instance globally availabe extern TinyGPSPlus gps; // Make TinyGPS++ instance globally availabe
#endif #endif
/*
// payload encoder // payload encoder
#if (PAYLOAD_ENCODER == 1) #if (PAYLOAD_ENCODER == 1)
extern TTNplain payload; extern TTNplain payload;
@ -54,4 +55,7 @@ extern TTNserialized payload;
extern CayenneLPP payload; extern CayenneLPP payload;
#else #else
#error "No valid payload converter defined" #error "No valid payload converter defined"
#endif #endif
*/
extern TTNplain payload;

5
src/main.cpp
View File

@ -70,6 +70,7 @@ portMUX_TYPE timerMux =
std::set<uint16_t> macs; // associative container holds total of unique MAC std::set<uint16_t> macs; // associative container holds total of unique MAC
// adress hashes (Wifi + BLE) // adress hashes (Wifi + BLE)
/*
// initialize payload encoder // initialize payload encoder
#if (PAYLOAD_ENCODER == 1) #if (PAYLOAD_ENCODER == 1)
TTNplain payload(PAYLOAD_BUFFER_SIZE); TTNplain payload(PAYLOAD_BUFFER_SIZE);
@ -80,6 +81,10 @@ CayenneLPP payload(PAYLOAD_BUFFER_SIZE);
#else #else
#error "No valid payload converter defined" #error "No valid payload converter defined"
#endif #endif
*/
TTNplain payload(PAYLOAD_BUFFER_SIZE);
// this variables will be changed in the ISR, and read in main loop // this variables will be changed in the ISR, and read in main loop
static volatile int ButtonPressedIRQ = 0, DisplayTimerIRQ = 0, static volatile int ButtonPressedIRQ = 0, DisplayTimerIRQ = 0,