From 68ac02dc4eee1184b32c607505335ac830060443 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Mon, 9 Dec 2024 13:43:34 -0300 Subject: [PATCH] t-beams validadas y radiolib710 --- common_settings.ini | 2 +- include/power_utils.h | 1 + src/menu_utils.cpp | 1 + src/sleep_utils.cpp | 1 + variants/ttgo-t-beam-v0_7/board_pinout.h | 6 +++--- variants/ttgo-t-beam-v0_7/platformio.ini | 1 - variants/ttgo-t-beam-v1/board_pinout.h | 6 +++--- variants/ttgo-t-beam-v1_2/board_pinout.h | 4 ++-- variants/ttgo-t-beam-v1_2_915/board_pinout.h | 4 ++-- variants/ttgo-t-beam-v1_915/board_pinout.h | 6 +++--- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/common_settings.ini b/common_settings.ini index 1fcaaae..168842b 100644 --- a/common_settings.ini +++ b/common_settings.ini @@ -30,7 +30,7 @@ lib_deps = adafruit/Adafruit BME680 Library @ 2.0.4 bblanchon/ArduinoJson @ 6.21.3 h2zero/NimBLE-Arduino @ 1.4.1 - jgromes/RadioLib @ 6.6.0 + jgromes/RadioLib @ 7.1.0 mathieucarbou/AsyncTCP @ 3.2.5 mathieucarbou/ESPAsyncWebServer @ 3.2.3 mikalhart/TinyGPSPlus @ 1.0.3 diff --git a/include/power_utils.h b/include/power_utils.h index 0231f4c..95fe6b9 100644 --- a/include/power_utils.h +++ b/include/power_utils.h @@ -2,6 +2,7 @@ #define POWER_UTILS_H_ #include +#include "board_pinout.h" #if defined(HAS_AXP2101) || defined(HAS_AXP192) #include "XPowersLib.h" #else diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp index 210bf30..3e9cc29 100644 --- a/src/menu_utils.cpp +++ b/src/menu_utils.cpp @@ -6,6 +6,7 @@ #include "configuration.h" #include "APRSPacketLib.h" #include "battery_utils.h" +#include "board_pinout.h" #include "power_utils.h" #include "menu_utils.h" #include "msg_utils.h" diff --git a/src/sleep_utils.cpp b/src/sleep_utils.cpp index ca77105..9cb43b6 100644 --- a/src/sleep_utils.cpp +++ b/src/sleep_utils.cpp @@ -1,3 +1,4 @@ +#include "board_pinout.h" #include "sleep_utils.h" #include "power_utils.h" diff --git a/variants/ttgo-t-beam-v0_7/board_pinout.h b/variants/ttgo-t-beam-v0_7/board_pinout.h index 190e384..61c5761 100644 --- a/variants/ttgo-t-beam-v0_7/board_pinout.h +++ b/variants/ttgo-t-beam-v0_7/board_pinout.h @@ -23,10 +23,10 @@ #define GPS_RX 15 #define GPS_TX 12 - // OTHER + // OTHER #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam #define BATTERY_PIN 35 - #define HAS_BT_CLASSIC - + #define HAS_BT_CLASSIC + #endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v0_7/platformio.ini b/variants/ttgo-t-beam-v0_7/platformio.ini index 8dc5982..a00d08f 100644 --- a/variants/ttgo-t-beam-v0_7/platformio.ini +++ b/variants/ttgo-t-beam-v0_7/platformio.ini @@ -1,4 +1,3 @@ - [env:ttgo-t-beam-v0_7] extends = env:esp32 board = ttgo-t-beam diff --git a/variants/ttgo-t-beam-v1/board_pinout.h b/variants/ttgo-t-beam-v1/board_pinout.h index 491a930..09d645f 100644 --- a/variants/ttgo-t-beam-v1/board_pinout.h +++ b/variants/ttgo-t-beam-v1/board_pinout.h @@ -24,10 +24,10 @@ #define GPS_RX 12 #define GPS_TX 34 - // OTHER + // OTHER #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam #define HAS_AXP192 - #define HAS_BT_CLASSIC - + #define HAS_BT_CLASSIC + #endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v1_2/board_pinout.h b/variants/ttgo-t-beam-v1_2/board_pinout.h index fdc33f2..78c5662 100644 --- a/variants/ttgo-t-beam-v1_2/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2/board_pinout.h @@ -24,10 +24,10 @@ #define GPS_RX 12 #define GPS_TX 34 - // OTHER + // OTHER #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam #define HAS_AXP2101 - #define HAS_BT_CLASSIC + #define HAS_BT_CLASSIC #endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v1_2_915/board_pinout.h b/variants/ttgo-t-beam-v1_2_915/board_pinout.h index a1537c5..321e473 100644 --- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h @@ -24,10 +24,10 @@ #define GPS_RX 12 #define GPS_TX 34 - // OTHER + // OTHER #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam #define HAS_AXP2101 - #define HAS_BT_CLASSIC + #define HAS_BT_CLASSIC #endif \ No newline at end of file diff --git a/variants/ttgo-t-beam-v1_915/board_pinout.h b/variants/ttgo-t-beam-v1_915/board_pinout.h index 357afb8..a967179 100644 --- a/variants/ttgo-t-beam-v1_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_915/board_pinout.h @@ -24,10 +24,10 @@ #define GPS_RX 12 #define GPS_TX 34 - // OTHER + // OTHER #define BUTTON_PIN 38 // The middle button GPIO on the T-Beam #define HAS_AXP192 - #define HAS_BT_CLASSIC - + #define HAS_BT_CLASSIC + #endif \ No newline at end of file