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

revert display lib driver handling & update lmic

Browse Source
This commit is contained in:
Klaus K Wilting 2020-05-15 18:30:21 +02:00
parent cfb40d300c
commit 2b46a69dbe
17 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platformio.ini
View File

@ -59,16 +59,13 @@ monitor_speed = 115200
upload_speed = 115200 ; set by build.py and taken from hal file upload_speed = 115200 ; set by build.py and taken from hal file
display_library = ; set by build.py and taken from hal file display_library = ; set by build.py and taken from hal file
lib_deps_lora = lib_deps_lora =
https://github.com/mcci-catena/arduino-lmic.git MCCI LoRaWAN LMIC library@3.2.0 ; MCCI LMIC by Terrill Moore
;MCCI LoRaWAN LMIC library@3.1.0 ; MCCI LMIC by Terrill Moore
lib_deps_display = lib_deps_display =
OneBitDisplay@1.3.0 OneBitDisplay@1.3.0
QRCode@0.0.1 QRCode@0.0.1
lib_deps_oled_display =
OneBitDisplay@1.3.0
BitBang_I2C@2.1.1 BitBang_I2C@2.1.1
lib_deps_tft_display = ;TFT_eSPI@2.2.6
TFT_eSPI@2.2.4 https://github.com/Bodmer/TFT_eSPI.git
lib_deps_ledmatrix = lib_deps_ledmatrix =
Ultrathin_LED_Matrix@>=1.0.0 Ultrathin_LED_Matrix@>=1.0.0
lib_deps_rgbled = lib_deps_rgbled =
@ -92,7 +89,6 @@ lib_deps_all =
${common.lib_deps_basic} ${common.lib_deps_basic}
${common.lib_deps_lora} ${common.lib_deps_lora}
${common.lib_deps_display} ${common.lib_deps_display}
${common.display_library}
${common.lib_deps_rgbled} ${common.lib_deps_rgbled}
${common.lib_deps_gps} ${common.lib_deps_gps}
${common.lib_deps_sensors} ${common.lib_deps_sensors}

1
src/hal/ecopower.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board esp32dev // board esp32dev
// display_library lib_deps_oled_display
#ifndef _GENERIC_H #ifndef _GENERIC_H
#define _GENERIC_H #define _GENERIC_H

1
src/hal/heltec.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board heltec_wifi_lora_32 // board heltec_wifi_lora_32
// display_library lib_deps_oled_display
#ifndef _HELTEC_H #ifndef _HELTEC_H
#define _HELTEC_H #define _HELTEC_H

1
src/hal/heltecv2.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board heltec_wifi_lora_32_V2 // board heltec_wifi_lora_32_V2
// display_library lib_deps_oled_display
#ifndef _HELTECV2_H #ifndef _HELTECV2_H
#define _HELTECV2_H #define _HELTECV2_H

1
src/hal/lolin32lora.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board lolin32 // board lolin32
// display_library lib_deps_oled_display
#ifndef _LOLINLORA_H #ifndef _LOLINLORA_H
#define _LOLINLORA_H #define _LOLINLORA_H

3
src/hal/m5core.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board m5stack-core-esp32 // board m5stack-core-esp32
// display_library lib_deps_tft_display
#ifndef _M5CORE_H #ifndef _M5CORE_H
#define _M5CORE_H #define _M5CORE_H
@ -30,7 +29,7 @@
//#define HAS_SENSORS 1 // comment out if device has user defined sensors //#define HAS_SENSORS 1 // comment out if device has user defined sensors
#define CFG_sx1276_radio 1 // select LoRa chip #define CFG_sx1276_radio 1 // select LoRa chip
#define BOARD_HAS_PSRAM // use if board has external PSRAM //#define BOARD_HAS_PSRAM // use if board has external PSRAM
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
#define HAS_DISPLAY 2 // TFT-LCD, support work in progess, not ready yet #define HAS_DISPLAY 2 // TFT-LCD, support work in progess, not ready yet

1
src/hal/m5fire.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board m5stack-fire // board m5stack-fire
// display_library lib_deps_tft_display
#ifndef _M5FIRE_H #ifndef _M5FIRE_H
#define _M5FIRE_H #define _M5FIRE_H

1
src/hal/octopus32.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board featheresp32 // board featheresp32
// display_library lib_deps_oled_display
#ifndef _OCTOPUS_H #ifndef _OCTOPUS_H
#define _OCTOPUS_H #define _OCTOPUS_H

1
src/hal/olimexpoe.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board esp32dev // board esp32dev
// display_library lib_deps_oled_display
#ifndef _GENERIC_H #ifndef _GENERIC_H
#define _GENERIC_H #define _GENERIC_H

1
src/hal/ttgobeam.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board ttgo-t-beam // board ttgo-t-beam
// display_library lib_deps_oled_display
#ifndef _TTGOBEAM_H #ifndef _TTGOBEAM_H
#define _TTGOBEAM_H #define _TTGOBEAM_H

1
src/hal/ttgobeam10.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board ttgo-t-beam // board ttgo-t-beam
// display_library lib_deps_oled_display
#ifndef _TTGOBEAM_H #ifndef _TTGOBEAM_H
#define _TTGOBEAM_H #define _TTGOBEAM_H

1
src/hal/ttgofox.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board esp32dev // board esp32dev
// display_library lib_deps_oled_display
#ifndef _TTGOFOX_H #ifndef _TTGOFOX_H
#define _TTGOFOX_H #define _TTGOFOX_H

1
src/hal/ttgov1.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 115200 // upload_speed 115200
// board ttgo-lora32-v1 // board ttgo-lora32-v1
// display_library lib_deps_oled_display
#ifndef _TTGOV1_H #ifndef _TTGOV1_H
#define _TTGOV1_H #define _TTGOV1_H

1
src/hal/ttgov2.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board ttgo-lora32-v1 // board ttgo-lora32-v1
// display_library lib_deps_oled_display
#ifndef _TTGOV2_H #ifndef _TTGOV2_H
#define _TTGOV2_H #define _TTGOV2_H

1
src/hal/ttgov21new.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board esp32dev // board esp32dev
// display_library lib_deps_oled_display
#ifndef _TTGOV21NEW_H #ifndef _TTGOV21NEW_H
#define _TTGOV21NEW_H #define _TTGOV21NEW_H

1
src/hal/ttgov21old.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board esp32dev // board esp32dev
// display_library lib_deps_oled_display
#ifndef _TTGOV21OLD_H #ifndef _TTGOV21OLD_H
#define _TTGOV21OLD_H #define _TTGOV21OLD_H

1
src/hal/wemos32oled.h
View File

@ -1,7 +1,6 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board lolin32 // board lolin32
// display_library lib_deps_oled_display
#ifndef _WEMOS32OLED_H #ifndef _WEMOS32OLED_H
#define _WEMOS32OLED_H #define _WEMOS32OLED_H