Merge branch 'joseph' into development

This commit is contained in:
Verkehrsrot authored and GitHub committed 2022-01-29 13:50:38 +01:00
commit 4c04f51151
3 files changed
+9 -7

No files matched your search

+4 -2
View File
@@ -18,8 +18,10 @@
// 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_DISPLAY 1
#define HAS_LED (25) // green on board LED (set to NOT_A_PIN to disable)
//#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
+1 -1
View File
@@ -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