DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #366 from cyberman54/master

Browse Source 
update dev to master
This commit is contained in:
Verkehrsrot 2019-05-18 13:12:17 +02:00 committed by GitHub
commit 3baf0c4ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -152,7 +152,7 @@ monitor_speed = ${common.monitor_speed}
[env:heltecv2] [env:heltecv2]
platform = ${common.platform_espressif32} platform = ${common.platform_espressif32}
framework = arduino framework = arduino
board = heltec_wifi_lora_32 board = heltec_wifi_lora_32_V2
board_build.partitions = ${common.board_build.partitions} board_build.partitions = ${common.board_build.partitions}
upload_speed = 921600 upload_speed = 921600
lib_deps = lib_deps =

14
src/hal/ttgofox.h
View File

@ -11,9 +11,9 @@
#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C #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 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_SW GPIO_NUM_25 // switches power for LoRa chip
//#define EXT_POWER_ON 1 #define EXT_POWER_ON 0
//#define EXT_POWER_OFF 0 #define EXT_POWER_OFF 1
#define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL #define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL
#define BAT_VOLTAGE_DIVIDER 2 // voltage divider 100k/100k on board #define BAT_VOLTAGE_DIVIDER 2 // voltage divider 100k/100k on board
#define HAS_BUTTON GPIO_NUM_36 // on board button (next to reset) #define HAS_BUTTON GPIO_NUM_36 // on board button (next to reset)
@ -35,10 +35,10 @@
//#define DCF77_ACTIVE_LOW 1 //#define DCF77_ACTIVE_LOW 1
// Pins for LORA chip SPI interface, reset line and interrupt lines // Pins for LORA chip SPI interface, reset line and interrupt lines
#define LORA_SCK SCK #define LORA_SCK (5)
#define LORA_CS SS #define LORA_CS (18)
#define LORA_MISO MISO #define LORA_MISO (19)
#define LORA_MOSI MOSI #define LORA_MOSI (27)
#define LORA_RST (23) #define LORA_RST (23)
#define LORA_IRQ (26) #define LORA_IRQ (26)
#define LORA_IO1 (33) #define LORA_IO1 (33)