From eedb42c18a33f72b9f81fb92cb78f20d8fb30a5a Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Wed, 1 Aug 2018 12:50:23 +0200 Subject: [PATCH] v1.4.0 --- platformio.ini | 4 ++-- src/beacon_array.h | 6 ++---- src/globals.h | 2 +- src/paxcounter.conf | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/platformio.ini b/platformio.ini index 5e9adf89..579cd667 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,8 +12,8 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] ;env_default = test -;env_default = generic -env_default = heltec +env_default = generic +;env_default = heltec ;env_default = ttgov1 ;env_default = ttgov2 ;env_default = ttgov21 diff --git a/src/beacon_array.h b/src/beacon_array.h index e0e715bf..c94aeca2 100644 --- a/src/beacon_array.h +++ b/src/beacon_array.h @@ -3,9 +3,7 @@ std::array::iterator it; -std::array beacons = {0x0102030405060708, 0xaaaaaaaaaaaaaaaa, - 0xaaaaaaaaaaaaaaa1, 0x0000807abf6f522b, - 0x0000807abfedb08e, 0x00005BEEB69AA8FC, - 0x0000DB53A5362400}; +std::array beacons = {0x0000010203040506, 0x0000aabbccddeeff, + 0x0000112233445566}; #endif \ No newline at end of file diff --git a/src/globals.h b/src/globals.h index 485b5c48..ba75f1c4 100644 --- a/src/globals.h +++ b/src/globals.h @@ -8,7 +8,7 @@ #include // attn: increment version after modifications to configData_t truct! -#define PROGVERSION "1.3.97" // use max 10 chars here! +#define PROGVERSION "1.4.0" // use max 10 chars here! #define PROGNAME "PAXCNT" // std::set for unified array functions diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 547b7201..799c55d4 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -9,7 +9,7 @@ // Payload send cycle and encoding #define SEND_SECS 30 // payload send cycle [seconds/2] -> 60 sec. -#define PAYLOAD_ENCODER 2 // payload encoder: 1=Plain, 2=Packed, 3=CayenneLPP dynamic, 4=CayenneLPP packed +#define PAYLOAD_ENCODER 1 // payload encoder: 1=Plain, 2=Packed, 3=CayenneLPP dynamic, 4=CayenneLPP packed // Set this to include BLE counting and vendor filter functions #define VENDORFILTER 1 // comment out if you want to count things, not people