Merge branch 'master' into development

This commit is contained in:
Verkehrsrot 2018-08-11 19:33:45 +02:00 committed by GitHub
commit e0de50acd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions

View File

@ -116,7 +116,7 @@ Paxcounter generates identifiers for sniffed MAC adresses and collects them temp
# Payload format # Payload format
You can select different payload formats in [paxcounter.conf](src/paxcounter.conf#L40): You can select different payload formats in [paxcounter.conf](src/paxcounter.conf#L12):
- ***Plain*** uses big endian format and generates json fields, e.g. useful for TTN console - ***Plain*** uses big endian format and generates json fields, e.g. useful for TTN console

View File

@ -6,6 +6,7 @@
#define HAS_LED GPIO_NUM_23 // blue LED on board #define HAS_LED GPIO_NUM_23 // blue LED on board
#define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board #define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
// re-define pin definitions of pins_arduino.h // re-define pin definitions of pins_arduino.h
#define PIN_SPI_SS GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input #define PIN_SPI_SS GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input

View File

@ -15,6 +15,5 @@ typedef struct {
} cmd_t; } cmd_t;
void rcommand(uint8_t cmd[], uint8_t cmdlength); void rcommand(uint8_t cmd[], uint8_t cmdlength);
void switch_lora(uint8_t sf, uint8_t tx);
#endif #endif