From de56525a0f3d1f6e7bacc5fb39b53029de61e081 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 6 Mar 2019 23:44:53 +0100 Subject: [PATCH 1/5] v1.7.35 --- platformio.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 34e70804..180e110f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -6,7 +6,7 @@ ; ---> SELECT TARGET PLATFORM HERE! <--- [platformio] -;env_default = generic +env_default = generic ;env_default = ebox ;env_default = eboxtube ;env_default = heltec @@ -15,7 +15,7 @@ ;env_default = ttgov2 ;env_default = ttgov21old ;env_default = ttgov21new -env_default = ttgobeam +;env_default = ttgobeam ;env_default = ttgofox ;env_default = lopy ;env_default = lopy4 @@ -30,10 +30,10 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 1.7.324 +release_version = 1.7.35 ; 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 = 4 +debug_level = 3 ; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA upload_protocol = esptool ;upload_protocol = custom From acc93f17abf852e1d4fb8d13616d8be1f577a11b Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 6 Mar 2019 23:46:36 +0100 Subject: [PATCH 2/5] paxcounter.conf --- src/paxcounter.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paxcounter.conf b/src/paxcounter.conf index e0660c3c..29f83297 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -68,7 +68,7 @@ // settings for syncing time of node with external time source #define TIME_SYNC_INTERVAL 2 // sync time attempt each .. minutes from time source (GPS/LORA/RTC) [default = 60], comment out means off //#define TIME_SYNC_LORA 1 // use LORA network as time source, comment out means off [default = off] -#define DBTIMESYNC 1 // use DB LORA timeserver with patented sync algorithm [default = off] +//#define DBTIMESYNC 1 // use DB LORA timeserver with patented sync algorithm [default = off] // time zone, see https://github.com/JChristensen/Timezone/blob/master/examples/WorldClock/WorldClock.ino #define DAYLIGHT_TIME {"CEST", Last, Sun, Mar, 2, 120} // Central European Summer Time From afe533492b5d58f98eb528564737e91640ec7a34 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 6 Mar 2019 23:49:17 +0100 Subject: [PATCH 3/5] Update paxcounter.conf --- src/paxcounter.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/paxcounter.conf b/src/paxcounter.conf index e0660c3c..ccf18ca1 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -68,7 +68,7 @@ // settings for syncing time of node with external time source #define TIME_SYNC_INTERVAL 2 // sync time attempt each .. minutes from time source (GPS/LORA/RTC) [default = 60], comment out means off //#define TIME_SYNC_LORA 1 // use LORA network as time source, comment out means off [default = off] -#define DBTIMESYNC 1 // use DB LORA timeserver with patented sync algorithm [default = off] +//#define DBTIMESYNC 1 // use DB LORA timeserver with patented sync algorithm [default = off] // time zone, see https://github.com/JChristensen/Timezone/blob/master/examples/WorldClock/WorldClock.ino #define DAYLIGHT_TIME {"CEST", Last, Sun, Mar, 2, 120} // Central European Summer Time @@ -99,4 +99,4 @@ #define CAYENNE_SENSORENABLE 14 // sensor enable configuration // LMIC settings -// -> in src/lmic_config.h \ No newline at end of file +// -> in src/lmic_config.h From 9b3d2309d8ee730ec2c626fd2e71a8579e6e120a Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Thu, 7 Mar 2019 00:01:51 +0100 Subject: [PATCH 4/5] includes --- .gitignore | 3 +-- include/lorawan.h | 2 ++ include/rcommand.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa33e14f..4d3180bd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ .gcc-flags.json src/loraconf.h src/ota.conf -src/DBtimesync.cpp -include/DBtimesync.h \ No newline at end of file +src/DBtimesync.cpp \ No newline at end of file diff --git a/include/lorawan.h b/include/lorawan.h index 86f8e852..3726f030 100644 --- a/include/lorawan.h +++ b/include/lorawan.h @@ -4,7 +4,9 @@ #include "globals.h" #include "rcommand.h" #include "timekeeper.h" +#ifdef DBTIMESYNC #include "DBtimesync.h" +#endif // LMIC-Arduino LoRaWAN Stack #include diff --git a/include/rcommand.h b/include/rcommand.h index dea6ce99..68227755 100644 --- a/include/rcommand.h +++ b/include/rcommand.h @@ -9,7 +9,9 @@ #include #include "cyclic.h" #include "timekeeper.h" +#ifdef DBTIMESYNC #include "DBtimesync.h" +#endif // table of remote commands and assigned functions typedef struct { From c2a2c554d39b60ed52ce3c9527da477754409983 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Thu, 7 Mar 2019 00:03:25 +0100 Subject: [PATCH 5/5] .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d3180bd..aa33e14f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ .gcc-flags.json src/loraconf.h src/ota.conf -src/DBtimesync.cpp \ No newline at end of file +src/DBtimesync.cpp +include/DBtimesync.h \ No newline at end of file