Merge branch 'master' into development

src/hal/ttgofox.h

@@ -10,6 +10,7 @@
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
 #define HAS_LED NOT_A_PIN // green on board LED is useless, is GPIO25, which switches power for Lora+Display
+
 //#define EXT_POWER_SW GPIO_NUM_25 // switches power for LoRa chip + display (0 = off / 1 = on)
 //#define EXT_POWER_ON    1
 //#define EXT_POWER_OFF   0
@@ -43,4 +44,4 @@
 #define LORA_IO1  (33)
 #define LORA_IO2  (32)
 
-#endif
+#endif

src/paxcounter.conf

@@ -70,10 +70,12 @@
 #define TIME_SYNC_COMPILEDATE           0       // set to 1 to use compile date to initialize RTC after power outage [default = 0]
 #define TIME_SYNC_LORAWAN               0       // set to 1 to use LORA network as time source, 0 means off [default = 0]
 #define TIME_SYNC_TIMESERVER            0       // set to 1 to use LORA timeserver as time source, 0 means off [default = 0]
+
 // settings for syncing time with timeserver applications
 #define TIME_SYNC_SAMPLES               1       // number of time requests for averaging
 #define TIME_SYNC_CYCLE                 20      // delay between two time samples [seconds]
 #define TIME_SYNC_TIMEOUT               120     // timeout waiting for timeserver answer [seconds]
+
 // 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
 #define STANDARD_TIME                   {"CET ", Last, Sun, Oct, 3, 60}      // Central European Standard Time