Merge branch 'master' into development

src/hal/ttgobeam.h

@@ -24,4 +24,5 @@
 #define RST LMIC_UNUSED_PIN // connected to ESP32 RST/EN
 #define DIO0 GPIO_NUM_26    // ESP32 GPIO26 <-> HPD13A IO0
 #define DIO1 GPIO_NUM_32 // Lora1 <-> HPD13A IO1 // !! NEEDS EXTERNAL WIRING !!
+//#define DIO1 GPIO_NUM_33 // Lora1 <-> HPD13A IO1 // for T-Beam T22_V05 only
 #define DIO2 LMIC_UNUSED_PIN // Lora2 <-> HPD13A IO2 // not needed for LoRa

src/paxcounter.conf

@@ -39,7 +39,10 @@
 #define WIFI_MY_COUNTRY                 "EU"    // select locale for Wifi RF settings
 #define	WIFI_CHANNEL_SWITCH_INTERVAL    50      // [seconds/100] -> 0,5 sec.
 
-// LoRa parameters
+// LoRa payload default parameters
+#define PAYLOAD_ENCODER                 1       // select payload encoder: 1=Plain [default], 2=Packed, 3=CayenneLPP
+#define SEND_SECS                       120     // payload send cycle [seconds/2] -> 240 sec.
+
 #define MEM_LOW                         2048    // [Bytes] low memory threshold triggering a send cycle
 #define RETRANSMIT_RCMD                 5       // [seconds] wait time before retransmitting rcommand results
 #define PAYLOAD_BUFFER_SIZE             51      // maximum size of payload block per transmit

src/payload.h

@@ -3,6 +3,7 @@
 
 // MyDevices CayenneLPP channels for dynamic sensor payload format
 #if (PAYLOAD_ENCODER == 3)
+
 #define LPP_GPS_CHANNEL 20
 #define LPP_COUNT_WIFI_CHANNEL 21
 #define LPP_COUNT_BLE_CHANNEL 22