diff --git a/lib/U8g2_ID942-tweaked/src/clib/u8x8_d_ssd1306_128x64_noname.c b/lib/U8g2_ID942-tweaked/src/clib/u8x8_d_ssd1306_128x64_noname.c index 9b102c86..09b16ab5 100644 --- a/lib/U8g2_ID942-tweaked/src/clib/u8x8_d_ssd1306_128x64_noname.c +++ b/lib/U8g2_ID942-tweaked/src/clib/u8x8_d_ssd1306_128x64_noname.c @@ -298,7 +298,7 @@ static const u8x8_display_info_t u8x8_ssd1306_128x64_noname_display_info = /* sck_pulse_width_ns = */ 50, /* SSD1306: 20ns, but cycle time is 100ns, so use 100/2, AVR: below 70: 8 MHz, >= 70 --> 4MHz clock */ /* sck_clock_hz = */ 8000000UL, /* since Arduino 1.6.0, the SPI bus speed in Hz. Should be 1000000000/sck_pulse_width_ns */ /* spi_mode = */ 0, /* active high, rising edge */ - /* ==> i2c_bus_clock_100kHz = */ 1, + /* ==> i2c_bus_clock_100kHz = */ 4, /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, diff --git a/src/hal/ttgobeam.h b/src/hal/ttgobeam.h index 827d9fdc..2c6a673d 100644 --- a/src/hal/ttgobeam.h +++ b/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 diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 4acd3bb5..14d76816 100644 --- a/src/paxcounter.conf +++ b/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 diff --git a/src/payload.h b/src/payload.h index 060a1e9a..1fb9ba12 100644 --- a/src/payload.h +++ b/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