Merge pull request #297 from cyberman54/master

sync master to dev

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 <lmic.h>

include/rcommand.h

@@ -9,7 +9,9 @@
 #include <rom/rtc.h>
 #include "cyclic.h"
 #include "timekeeper.h"
+#ifdef DBTIMESYNC
 #include "DBtimesync.h"
+#endif
 
 // table of remote commands and assigned functions
 typedef struct {

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

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