From aea6dc88c69a4e6fa15a99c3fa7926b7e0b99840 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Fri, 28 Jan 2022 21:43:59 +0100 Subject: [PATCH] for user joseph --- platformio_orig.ini | 8 ++++---- src/hal/ttgov21new.h | 7 ++++--- src/paxcounter_orig.conf | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platformio_orig.ini b/platformio_orig.ini index 100ede8a..507058a6 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -16,10 +16,10 @@ ;halfile = ttgov1.h ;halfile = ttgov2.h ;halfile = ttgov21old.h -;halfile = ttgov21new.h +halfile = ttgov21new.h ;halfile = ttgofox.h ;halfile = ttgobeam.h -halfile = ttgobeam10.h +;halfile = ttgobeam10.h ;halfile = ttgotdisplay.h ;halfile = ttgotwristband.h ;halfile = fipy.h @@ -48,7 +48,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 = 3.1.0 +release_version = 3.1.1 ; 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 @@ -56,7 +56,7 @@ extra_scripts = pre:build.py otakeyfile = ota.conf lorakeyfile = loraconf.h lmicconfigfile = lmic_config.h -platform_espressif32 = espressif32@3.4.0 +platform_espressif32 = espressif32@3.5.0 monitor_speed = 115200 upload_speed = 115200 ; set by build.py and taken from hal file display_library = ; set by build.py and taken from hal file diff --git a/src/hal/ttgov21new.h b/src/hal/ttgov21new.h index 71c22bca..5e0d0dd9 100644 --- a/src/hal/ttgov21new.h +++ b/src/hal/ttgov21new.h @@ -16,10 +16,11 @@ #define CFG_sx1276_radio 1 // HPD13A LoRa SoC // enable only if you want to store a local paxcount table on the device -#define HAS_SDCARD 2 // // this board has a SDMMC card-reader/writer +#define HAS_SDCARD 2 // this board has a SDMMC card-reader/writer -#define HAS_DISPLAY 1 -#define HAS_LED (25) // green on board LED +//#define HAS_DISPLAY 1 +//#define HAS_LED (25) // green on board LED +#define HAS_LED NOT_A_PIN #define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7 #define BAT_VOLTAGE_DIVIDER 2 // voltage divider 100k/100k on board diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf index 0fe927b9..ede57963 100644 --- a/src/paxcounter_orig.conf +++ b/src/paxcounter_orig.conf @@ -14,7 +14,7 @@ // Payload send cycle and encoding #define SENDCYCLE 30 // payload send cycle [seconds/2], 0 .. 255 -#define SLEEPCYCLE 0 // sleep time after a send cycle [seconds/10], 0 .. 65535; 0 means no sleep [default = 0] +#define SLEEPCYCLE 1800 // sleep time after a send cycle [seconds/10], 0 .. 65535; 0 means no sleep [default = 0] #define PAYLOAD_ENCODER 2 // payload encoder: 1=Plain, 2=Packed, 3=Cayenne LPP dynamic, 4=Cayenne LPP packed #define COUNTERMODE 0 // 0=cyclic, 1=cumulative, 2=cyclic confirmed