From e117f6945fba60e61802ea21c669b4c8883097ef Mon Sep 17 00:00:00 2001 From: Chrisotph Schultz Date: Sun, 27 Sep 2020 19:29:31 +0200 Subject: [PATCH] done chages --- platformio.ini | 10 +++++----- src/ota.sample.conf | 8 -------- src/paxcounter.conf | 4 ++-- 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 src/ota.sample.conf diff --git a/platformio.ini b/platformio.ini index 695b6435..d2669781 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,7 +7,7 @@ ; ---> SELECT THE TARGET PLATFORM HERE! <--- [board] -halfile = generic.h +;halfile = generic.h ;halfile = ebox.h ;halfile = eboxtube.h ;halfile = ecopower.h @@ -16,7 +16,7 @@ halfile = generic.h ;halfile = ttgov1.h ;halfile = ttgov2.h ;halfile = ttgov21old.h -;halfile = ttgov21new.h +halfile = ttgov21new.h ;halfile = ttgofox.h ;halfile = ttgobeam.h ;halfile = ttgobeam10.h @@ -46,7 +46,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 2.0.12 +release_version = 2.0.13 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose debug_level = 3 @@ -73,7 +73,7 @@ lib_deps_gps = lib_deps_sensors = adafruit/Adafruit Unified Sensor @ ^1.1.4 adafruit/Adafruit BME280 Library @ ^2.1.0 - adafruit/Adafruit BMP085 Library @ ^1.1.0 + adafruit/Adafruit BMP085 Unified boschsensortec/BSEC Software Library @ 1.5.1474 https://github.com/ricki-z/SDS011.git lib_deps_basic = @@ -110,7 +110,7 @@ build_flags_all = [env] lib_ldf_mode = deep ; #632 Fixes compiler error with OneBitDisplay library framework = arduino -board = esp32dev +board = ttgo-lora32-v21new board_build.partitions = min_spiffs.csv upload_speed = ${common.upload_speed} ;upload_port = COM8 diff --git a/src/ota.sample.conf b/src/ota.sample.conf deleted file mode 100644 index a10d79dc..00000000 --- a/src/ota.sample.conf +++ /dev/null @@ -1,8 +0,0 @@ -[ota] -OTA_WIFI_SSID = MyHomeWifi -OTA_WIFI_PASS = FooBar42! - -[bintray] -BINTRAY_USER = MyBintrayUser -BINTRAY_REPO = MyBintrayRepo -BINTRAY_API_TOKEN = 3894a7a51d70c6523c1b7479261c34845ebf7878 \ No newline at end of file diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 41a61673..e82d6adb 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -17,7 +17,7 @@ // Set this to include BLE counting and vendor filter functions, or to switch off WIFI counting #define VENDORFILTER 0 // set to 0 if you want to scan all devices, not filtering smartphone OUIs #define BLECOUNTER 1 // set to 0 if you do not want to install the BLE sniffer -#define WIFICOUNTER 0 // set to 0 if you do not want to install the WIFI sniffer +#define WIFICOUNTER 1 // set to 0 if you do not want to install the WIFI sniffer // BLE scan parameters #define BLESCANTIME 0 // [seconds] scan duration, 0 means infinite [default], see note below @@ -89,7 +89,7 @@ #define TIME_SYNC_INTERVAL_RETRY 10 // retry time sync after lost sync each .. minutes [default = 10], 0 means off #define TIME_SYNC_SAMPLES 1 // number of time requests for averaging, max. 255 #define TIME_SYNC_CYCLE 60 // delay between two time samples [seconds] -#define TIME_SYNC_TIMEOUT 300 // timeout waiting for timeserver answer [seconds] +#define TIME_SYNC_TIMEOUT 400 // timeout waiting for timeserver answer [seconds] #define TIME_SYNC_COMPILEDATE 0 // set to 1 to use compile date to initialize RTC after power outage [default = 0] // time zone, see https://github.com/JChristensen/Timezone/blob/master/examples/WorldClock/WorldClock.ino