From 75c16b95eb7f7a5b6bc067d8c37e6153a4899a62 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Fri, 12 Apr 2024 15:04:25 -0400 Subject: [PATCH] common libs edited --- platformio.ini | 117 ++++++++++++++++++++++++++++++++++++++++----- src/lora_utils.cpp | 9 +++- src/power_utils.h | 4 ++ 3 files changed, 117 insertions(+), 13 deletions(-) diff --git a/platformio.ini b/platformio.ini index 6f964d3..e56f79d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -18,27 +18,21 @@ lib_ldf_mode = deep+ monitor_speed = 115200 board_build.partitions = huge_app.csv monitor_filters = esp32_exception_decoder -lib_deps = - lewisxhe/XPowersLib@^0.1.8 + +[common] +lib_deps = mikalhart/TinyGPSPlus @ 1.0.3 paulstoffregen/Time @ 1.6.1 shaggydog/OneButton @ 1.5.0 bblanchon/ArduinoJson @ 6.21.3 - sandeepmistry/LoRa @ 0.8.0 - jgromes/RadioLib @ 6.1.0 - h2zero/NimBLE-Arduino@^1.4.1 + h2zero/NimBLE-Arduino@1.4.1 peterus/esp-logger @ 1.0.0 adafruit/Adafruit BusIO@^1.14.1 - adafruit/Adafruit GFX Library @ 1.11.7 - adafruit/Adafruit SSD1306 @ 2.5.7 adafruit/Adafruit Unified Sensor@^1.1.9 adafruit/Adafruit BME280 Library@^2.2.2 adafruit/Adafruit BMP280 Library@^2.6.8 adafruit/Adafruit BME680 Library@^2.0.4 - adafruit/Adafruit SH110X@^2.1.8 - bodmer/TFT_eSPI@^2.5.43 - [esp32dev_base] build_flags = ${env.build_flags} @@ -50,6 +44,7 @@ build_flags = -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 + [env:ttgo-t-beam-v1_2] board = ttgo-t-beam build_flags = @@ -59,6 +54,14 @@ build_flags = -DHAS_AXP2101 -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + lewisxhe/XPowersLib@^0.1.8 + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-beam-v1] board = ttgo-t-beam @@ -69,6 +72,14 @@ build_flags = -DHAS_AXP192 -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + lewisxhe/XPowersLib@^0.1.8 + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-lora32-v2_1_TNC] board = ttgo-lora32-v21 @@ -77,6 +88,13 @@ build_flags = -DTTGO_T_LORA32_V2_1_TNC -DHAS_SX127X -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-lora32-v2_1_GPS] board = ttgo-lora32-v21 @@ -85,6 +103,13 @@ build_flags = -DTTGO_T_LORA32_V2_1_GPS -DHAS_SX127X -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ESP32_DIY_LoRa_GPS] board = esp32dev @@ -93,6 +118,13 @@ build_flags = -DESP32_DIY_LoRa_GPS -DHAS_SX127X -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ESP32_DIY_1W_LoRa_GPS] board = esp32dev @@ -102,6 +134,13 @@ build_flags = -DHAS_SX126X -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-beam-v1_SX1268] board = ttgo-t-beam @@ -112,6 +151,14 @@ build_flags = -DHAS_AXP192 -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + lewisxhe/XPowersLib@^0.1.8 + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-beam-v1_2_SX1262] board = ttgo-t-beam @@ -122,6 +169,14 @@ build_flags = -DHAS_AXP2101 -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + lewisxhe/XPowersLib@^0.1.8 + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo-t-beam-v0_7] board = ttgo-t-beam @@ -131,6 +186,13 @@ build_flags = -DHAS_SX127X -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + sandeepmistry/LoRa @ 0.8.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:ttgo_t_beam_S3_SUPREME_V3] board = esp32-s3-devkitc-1 @@ -141,6 +203,14 @@ build_flags = -DHAS_SX126X -DHAS_AXP2101 -DHAS_BUTTON +lib_deps = + ${common.lib_deps} + lewisxhe/XPowersLib@^0.1.8 + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:heltec_V3_GPS] board = heltec_wifi_lora_32_V3 @@ -149,6 +219,13 @@ build_flags = -DHELTEC_V3_GPS -DHAS_SX126X -DHAS_BUTTON +lib_deps = + ${common.lib_deps} + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:OE5HWN_MeshCom] board = esp32dev @@ -158,6 +235,13 @@ build_flags = -DHAS_SX126X -DHAS_BUTTON -DHAS_BT_CLASSIC +lib_deps = + ${common.lib_deps} + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:esp32_c3_DIY_LoRa_GPS] board = esp32-c3-devkitm-1 @@ -167,6 +251,13 @@ build_flags = -DHAS_SX127X -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 +lib_deps = + ${common.lib_deps} + jgromes/RadioLib @ 6.1.0 + adafruit/Adafruit GFX Library @ 1.11.7 + adafruit/Adafruit SSD1306 @ 2.5.7 + adafruit/Adafruit SH110X@^2.1.8 + [env:heltec_wireless_tracker] board = esp32-s3-devkitc-1 @@ -202,4 +293,8 @@ build_flags = -D SPI_FREQUENCY=27000000 -D USE_HSPI_PORT ;-D LOAD_GFXFF - ;-D SMOOTH_FONT \ No newline at end of file + ;-D SMOOTH_FONT +lib_deps = + ${common.lib_deps} + jgromes/RadioLib @ 6.1.0 + bodmer/TFT_eSPI@^2.5.43 \ No newline at end of file diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index c4a3d53..3c34669 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -1,12 +1,17 @@ -#include #include -#include #include #include "notification_utils.h" #include "configuration.h" #include "pins_config.h" #include "msg_utils.h" #include "display.h" +#ifdef HAS_SX127X +#include +#endif +#ifdef HAS_SX126X +#include +#endif + extern logging::Logger logger; extern Configuration Config; diff --git a/src/power_utils.h b/src/power_utils.h index 40eeab1..6bcf04f 100644 --- a/src/power_utils.h +++ b/src/power_utils.h @@ -2,7 +2,11 @@ #define POWER_UTILS_H_ #include +#if defined(HAS_AXP2101) || defined(HAS_AXP192) #include "XPowersLib.h" +#else +#include +#endif namespace POWER_Utils {