From 4f9eac9e5c2e8cb8191058a55b760fdfc13c13ef Mon Sep 17 00:00:00 2001 From: richonguzman Date: Thu, 24 Apr 2025 09:44:57 -0400 Subject: [PATCH] cambio2 --- include/lora_utils.h | 4 +-- include/sleep_utils.h | 12 +++++++ src/LoRa_APRS_iGate.cpp | 2 ++ src/lora_utils.cpp | 19 +++++++++-- src/power_utils.cpp | 8 ----- src/sleep_utils.cpp | 32 +++++++++++++++++ .../ESP32_C3_OctopusLab_LoRa/board_pinout.h | 2 ++ variants/ESP32_DIY_1W_LoRa/board_pinout.h | 2 ++ variants/ESP32_DIY_1W_LoRa_915/board_pinout.h | 2 ++ .../ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h | 2 ++ .../board_pinout.h | 2 ++ variants/ESP32_DIY_LoRa/board_pinout.h | 2 ++ variants/ESP32_DIY_LoRa_915/board_pinout.h | 2 ++ variants/OE5HWN_MeshCom/board_pinout.h | 2 ++ .../QRPLabs_LightGateway_1_0/board_pinout.h | 2 ++ variants/TROY_LoRa_APRS/board_pinout.h | 2 ++ variants/WEMOS-D1-R32-RA02/board_pinout.h | 2 ++ .../WEMOS-LOLIN32-OLED-DIY/board_pinout.h | 2 ++ .../WEMOS_S2_MINI_DIY_LoRa/board_pinout.h | 2 ++ .../XIAO_ESP32S3_WIO_SX1262/board_pinout.h | 2 ++ variants/esp32c3_DIY_1W_LoRa/board_pinout.h | 2 ++ .../esp32c3_DIY_1W_LoRa_915/board_pinout.h | 2 ++ variants/heltec-lora32-v2/board_pinout.h | 2 ++ variants/heltec_ht-ct62/board_pinout.h | 2 ++ .../heltec_wifi_lora_32_V3/board_pinout.h | 2 ++ .../heltec_wifi_lora_32_V3_2/board_pinout.h | 2 ++ variants/heltec_wireless_paper/board_pinout.h | 2 ++ variants/heltec_wireless_stick/board_pinout.h | 2 ++ .../board_pinout.h | 2 ++ .../board_pinout.h | 2 ++ .../heltec_wireless_tracker/board_pinout.h | 2 ++ variants/ttgo-lora32-v21/board_pinout.h | 2 ++ variants/ttgo-lora32-v21_915/board_pinout.h | 2 ++ variants/ttgo-t-beam-v1/board_pinout.h | 2 ++ variants/ttgo-t-beam-v1_2/board_pinout.h | 2 ++ variants/ttgo-t-beam-v1_2_915/board_pinout.h | 2 ++ .../ttgo-t-beam-v1_2_SX1262/board_pinout.h | 2 ++ variants/ttgo-t-beam-v1_915/board_pinout.h | 2 ++ variants/ttgo-t-beam-v1_SX1268/board_pinout.h | 2 ++ variants/ttgo_lora32_t3s3_v1_2/board_pinout.h | 2 ++ .../ttgo_t_beam_s3_SUPREME_v3/board_pinout.h | 28 ++++++++------- variants/ttgo_t_deck_GPS/board_pinout.h | 32 +++++++++-------- variants/ttgo_t_deck_GPS/platformio.ini | 2 +- variants/ttgo_t_deck_plus/board_pinout.h | 34 ++++++++++--------- 44 files changed, 184 insertions(+), 57 deletions(-) create mode 100644 include/sleep_utils.h create mode 100644 src/sleep_utils.cpp diff --git a/include/lora_utils.h b/include/lora_utils.h index 6060221..ac62eea 100644 --- a/include/lora_utils.h +++ b/include/lora_utils.h @@ -8,11 +8,11 @@ namespace LoRa_Utils { void setup(); void sendNewPacket(const String& newPacket); - //String packetSanitization(const String& packet); String receivePacket(); void changeFreqTx(); void changeFreqRx(); - void startReceive(); + void wakeRadio(); + //void startReceive(); void sleepRadio(); } diff --git a/include/sleep_utils.h b/include/sleep_utils.h new file mode 100644 index 0000000..21024c3 --- /dev/null +++ b/include/sleep_utils.h @@ -0,0 +1,12 @@ +#ifndef SLEEP_UTILS_H_ +#define SLEEP_UTILS_H_ + +#include + +namespace SLEEP_Utils { + + void setup(); + +} + +#endif \ No newline at end of file diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 0e4f9f2..1b135fd 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -32,6 +32,7 @@ ___________________________________________________________________*/ #include "board_pinout.h" #include "syslog_utils.h" #include "power_utils.h" +#include "sleep_utils.h" #include "lora_utils.h" #include "wifi_utils.h" #include "digi_utils.h" @@ -133,6 +134,7 @@ void setup() { Config.loramodule.rxActive = false; } #endif + SLEEP_Utils::setup(); WIFI_Utils::setup(); NTP_Utils::setup(); SYSLOG_Utils::setup(); diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 326cfe4..ccb25b1 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -155,9 +155,20 @@ namespace LoRa_Utils { } } - void startReceive() { + /*void startReceive() { radio.startReceive(); - } + }*/ + + /*String receiveFromSleep() { + String packet = ""; + int state = radio.readData(packet); + if (state == RADIOLIB_ERR_NONE) { + // + } else { + packet = ""; + } + return packet; + }*/ String receivePacket() { String packet = ""; @@ -219,6 +230,10 @@ namespace LoRa_Utils { return packet; } + void wakeRadio() { + radio.startReceive(); + } + void sleepRadio() { radio.sleep(); } diff --git a/src/power_utils.cpp b/src/power_utils.cpp index 7c444f6..a349071 100644 --- a/src/power_utils.cpp +++ b/src/power_utils.cpp @@ -267,14 +267,6 @@ namespace POWER_Utils { delay(500); Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); #endif - - // PIN Ultra Eco Mode definitions - - - - - - // delay(1000); BATTERY_Utils::setup(); diff --git a/src/sleep_utils.cpp b/src/sleep_utils.cpp new file mode 100644 index 0000000..527c2bf --- /dev/null +++ b/src/sleep_utils.cpp @@ -0,0 +1,32 @@ +#include "configuration.h" +#include "board_pinout.h" +#include "sleep_utils.h" +#include "lora_utils.h" + + +extern Configuration Config; + +bool wakeUpFlag = false; + + +namespace SLEEP_Utils { + + void wakeUpLoRaPacketReceived() { + wakeUpFlag = true; + } + + void setup() { + if (Config.digi.ecoMode == 1) { + pinMode(RADIO_WAKEUP_PIN, INPUT); + attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING); + LoRa_Utils::wakeRadio(); + #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa) + esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH); + #endif + #if defined(HELTEC_HTCT62) || defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) || defined(ESP32_C3_OctopusLab_LoRa) + esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH); + #endif + } + } + +} \ No newline at end of file diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h index 3678f34..0545a43 100644 --- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h +++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h @@ -11,6 +11,8 @@ #define RADIO_DIO1_PIN 3 #define RADIO_RST_PIN -1 #define RADIO_BUSY_PIN 8 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN RADIO_DIO1_PIN // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h index ea5721b..1ff6fdc 100644 --- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 14 #define RADIO_RXEN 32 #define RADIO_TXEN 25 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_12 // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h index a443ace..504b96a 100644 --- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 14 #define RADIO_RXEN 32 #define RADIO_TXEN 25 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_12 // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h index 8ead59d..36758a8 100644 --- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 14 #define RADIO_RXEN 32 #define RADIO_TXEN 25 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_12 // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h index 74c785a..5eac920 100644 --- a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h +++ b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 32 #define RADIO_RXEN 14 #define RADIO_TXEN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_33 // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h index df4c67d..43c239b 100644 --- a/variants/ESP32_DIY_LoRa/board_pinout.h +++ b/variants/ESP32_DIY_LoRa/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h index 520a707..5454e55 100644 --- a/variants/ESP32_DIY_LoRa_915/board_pinout.h +++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/OE5HWN_MeshCom/board_pinout.h b/variants/OE5HWN_MeshCom/board_pinout.h index bff8b74..b0835a2 100644 --- a/variants/OE5HWN_MeshCom/board_pinout.h +++ b/variants/OE5HWN_MeshCom/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 26 #define RADIO_RXEN 14 #define RADIO_TXEN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_33 // Display #define HAS_DISPLAY diff --git a/variants/QRPLabs_LightGateway_1_0/board_pinout.h b/variants/QRPLabs_LightGateway_1_0/board_pinout.h index 73a2bd3..e31f1df 100644 --- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h +++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h @@ -13,6 +13,8 @@ #define RADIO_BUSY_PIN 6 #define RADIO_RXEN 42 #define RADIO_TXEN 14 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_5 // Display #define HAS_DISPLAY diff --git a/variants/TROY_LoRa_APRS/board_pinout.h b/variants/TROY_LoRa_APRS/board_pinout.h index e84718b..6529ff8 100644 --- a/variants/TROY_LoRa_APRS/board_pinout.h +++ b/variants/TROY_LoRa_APRS/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 23 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/WEMOS-D1-R32-RA02/board_pinout.h b/variants/WEMOS-D1-R32-RA02/board_pinout.h index 22c3704..5c98494 100644 --- a/variants/WEMOS-D1-R32-RA02/board_pinout.h +++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 13 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 12 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_12 // Display #define HAS_DISPLAY diff --git a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h index c27523f..f6d3ffe 100644 --- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h +++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 14 #define RADIO_RST_PIN 2 #define RADIO_BUSY_PIN 25 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_25 // Display #define HAS_DISPLAY diff --git a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h index d372f45..237826d 100644 --- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h +++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 34 #define RADIO_RST_PIN 33 #define RADIO_BUSY_PIN 38 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_38 // Aditional Config #define INTERNAL_LED_PIN 15 diff --git a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h index 6488487..0e80af1 100644 --- a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h +++ b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 42 #define RADIO_DIO1_PIN 39 #define RADIO_BUSY_PIN 40 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_39 #define RADIO_HAS_RF_SWITCH // DIO02 #define RADIO_RF_SWITCH 38 diff --git a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h index de8a339..cd4eb72 100644 --- a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h @@ -13,5 +13,7 @@ #define RADIO_BUSY_PIN 3 #define RADIO_RXEN 6 #define RADIO_TXEN 7 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN RADIO_DIO1_PIN #endif \ No newline at end of file diff --git a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h index 7ed7d6d..77a6d22 100644 --- a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h +++ b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h @@ -13,5 +13,7 @@ #define RADIO_BUSY_PIN 3 #define RADIO_RXEN 6 #define RADIO_TXEN 7 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN RADIO_DIO1_PIN #endif \ No newline at end of file diff --git a/variants/heltec-lora32-v2/board_pinout.h b/variants/heltec-lora32-v2/board_pinout.h index 2aedf66..3773dd6 100644 --- a/variants/heltec-lora32-v2/board_pinout.h +++ b/variants/heltec-lora32-v2/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/heltec_ht-ct62/board_pinout.h b/variants/heltec_ht-ct62/board_pinout.h index aad1963..9faa1d9 100644 --- a/variants/heltec_ht-ct62/board_pinout.h +++ b/variants/heltec_ht-ct62/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 5 #define RADIO_DIO1_PIN 3 #define RADIO_BUSY_PIN 4 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN RADIO_DIO1_PIN // Aditional Config #define BATTERY_PIN 1 diff --git a/variants/heltec_wifi_lora_32_V3/board_pinout.h b/variants/heltec_wifi_lora_32_V3/board_pinout.h index 4746646..1ba907f 100644 --- a/variants/heltec_wifi_lora_32_V3/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h index 4746646..1ba907f 100644 --- a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h +++ b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/heltec_wireless_paper/board_pinout.h b/variants/heltec_wireless_paper/board_pinout.h index 30bc620..83e39b5 100644 --- a/variants/heltec_wireless_paper/board_pinout.h +++ b/variants/heltec_wireless_paper/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/heltec_wireless_stick/board_pinout.h b/variants/heltec_wireless_stick/board_pinout.h index 4746646..1ba907f 100644 --- a/variants/heltec_wireless_stick/board_pinout.h +++ b/variants/heltec_wireless_stick/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/heltec_wireless_stick_lite_v3/board_pinout.h b/variants/heltec_wireless_stick_lite_v3/board_pinout.h index 649e754..6455500 100644 --- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Aditional Config #define INTERNAL_LED_PIN 35 diff --git a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h index b4c395b..4b95337 100644 --- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h +++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 #define RADIO_DIO1_PIN 14 #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/heltec_wireless_tracker/board_pinout.h b/variants/heltec_wireless_tracker/board_pinout.h index b30fd1c..9e1f598 100644 --- a/variants/heltec_wireless_tracker/board_pinout.h +++ b/variants/heltec_wireless_tracker/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 12 // SX1262 RST #define RADIO_DIO1_PIN 14 // SX1262 DIO1 #define RADIO_BUSY_PIN 13 // SX1262 BUSY + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_14 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-lora32-v21/board_pinout.h b/variants/ttgo-lora32-v21/board_pinout.h index 5450287..47737d5 100644 --- a/variants/ttgo-lora32-v21/board_pinout.h +++ b/variants/ttgo-lora32-v21/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-lora32-v21_915/board_pinout.h b/variants/ttgo-lora32-v21_915/board_pinout.h index 1231e9b..f8879c1 100644 --- a/variants/ttgo-lora32-v21_915/board_pinout.h +++ b/variants/ttgo-lora32-v21_915/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-t-beam-v1/board_pinout.h b/variants/ttgo-t-beam-v1/board_pinout.h index 089d433..0fad163 100644 --- a/variants/ttgo-t-beam-v1/board_pinout.h +++ b/variants/ttgo-t-beam-v1/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-t-beam-v1_2/board_pinout.h b/variants/ttgo-t-beam-v1_2/board_pinout.h index 25d7763..6d54cac 100644 --- a/variants/ttgo-t-beam-v1_2/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY 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 f8564fc..1985525 100644 --- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h index 17f3c8a..74d893d 100644 --- a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h +++ b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h @@ -11,6 +11,8 @@ #define RADIO_RST_PIN 23 #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 32 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_33 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-t-beam-v1_915/board_pinout.h b/variants/ttgo-t-beam-v1_915/board_pinout.h index 3bd2838..393f300 100644 --- a/variants/ttgo-t-beam-v1_915/board_pinout.h +++ b/variants/ttgo-t-beam-v1_915/board_pinout.h @@ -9,6 +9,8 @@ #define RADIO_CS_PIN 18 #define RADIO_RST_PIN 14 #define RADIO_BUSY_PIN 26 + #define RADIO_WAKEUP_PIN RADIO_BUSY_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_26 // Display #define HAS_DISPLAY diff --git a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h index b801c3a..9ba4515 100644 --- a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h +++ b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h @@ -11,6 +11,8 @@ #define RADIO_RST_PIN 23 #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 32 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_33 // Display #define HAS_DISPLAY diff --git a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h index 7becdd0..812e997 100644 --- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h +++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h @@ -10,6 +10,8 @@ #define RADIO_RST_PIN 8 #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_33 // Display #define HAS_DISPLAY diff --git a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h index bf0f05d..a0982e8 100644 --- a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h +++ b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h @@ -3,14 +3,16 @@ // LoRa Radio #define HAS_SX1262 - #define RADIO_SCLK_PIN 12 - #define RADIO_MISO_PIN 13 - #define RADIO_MOSI_PIN 11 - #define RADIO_CS_PIN 10 - #define RADIO_DIO0_PIN -1 - #define RADIO_RST_PIN 5 - #define RADIO_DIO1_PIN 1 - #define RADIO_BUSY_PIN 4 + #define RADIO_SCLK_PIN 12 + #define RADIO_MISO_PIN 13 + #define RADIO_MOSI_PIN 11 + #define RADIO_CS_PIN 10 + #define RADIO_DIO0_PIN -1 + #define RADIO_RST_PIN 5 + #define RADIO_DIO1_PIN 1 + #define RADIO_BUSY_PIN 4 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_1 // Display #define HAS_DISPLAY @@ -19,9 +21,9 @@ #undef OLED_SCL #undef OLED_RST - #define OLED_SDA 17 - #define OLED_SCL 18 - #define OLED_RST 16 + #define OLED_SDA 17 + #define OLED_SCL 18 + #define OLED_RST 16 #define OLED_DISPLAY_HAS_RST_PIN // Aditional Config @@ -29,8 +31,8 @@ // GPS #define HAS_GPS - #define GPS_RX 8 - #define GPS_TX 9 + #define GPS_RX 8 + #define GPS_TX 9 #define BOARD_HAS_PSRAM diff --git a/variants/ttgo_t_deck_GPS/board_pinout.h b/variants/ttgo_t_deck_GPS/board_pinout.h index 8e2e4f9..aef9282 100644 --- a/variants/ttgo_t_deck_GPS/board_pinout.h +++ b/variants/ttgo_t_deck_GPS/board_pinout.h @@ -3,13 +3,15 @@ // LoRa Radio #define HAS_SX1262 - #define RADIO_SCLK_PIN 40 - #define RADIO_MISO_PIN 38 - #define RADIO_MOSI_PIN 41 - #define RADIO_CS_PIN 9 - #define RADIO_RST_PIN 17 - #define RADIO_DIO1_PIN 45 - #define RADIO_BUSY_PIN 13 + #define RADIO_SCLK_PIN 40 + #define RADIO_MISO_PIN 38 + #define RADIO_MOSI_PIN 41 + #define RADIO_CS_PIN 9 + #define RADIO_RST_PIN 17 + #define RADIO_DIO1_PIN 45 + #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_45 // Display #define HAS_DISPLAY @@ -20,17 +22,17 @@ #undef OLED_RST // GPS - #define GPS_RX 43 - #define GPS_TX 44 + #define GPS_RX 43 + #define GPS_TX 44 // Aditional Config - #define BATTERY_PIN 4 + #define BATTERY_PIN 4 - #define BOARD_POWERON 10 - #define BOARD_SDCARD_CS 39 - #define BOARD_BL_PIN 42 + #define BOARD_POWERON 10 + #define BOARD_SDCARD_CS 39 + #define BOARD_BL_PIN 42 - #define BOARD_I2C_SDA 18 - #define BOARD_I2C_SCL 8 + #define BOARD_I2C_SDA 18 + #define BOARD_I2C_SCL 8 #endif \ No newline at end of file diff --git a/variants/ttgo_t_deck_GPS/platformio.ini b/variants/ttgo_t_deck_GPS/platformio.ini index dcca21a..7f82ac0 100644 --- a/variants/ttgo_t_deck_GPS/platformio.ini +++ b/variants/ttgo_t_deck_GPS/platformio.ini @@ -18,7 +18,7 @@ debug_tool = esp-prog build_flags = ${common.build_flags} ${common.usb_flags} - -D TTGO_T_DECK_PLUS + -D TTGO_T_DECK_GPS -D BOARD_HAS_PSRAM -D USER_SETUP_LOADED -D ST7789_DRIVER diff --git a/variants/ttgo_t_deck_plus/board_pinout.h b/variants/ttgo_t_deck_plus/board_pinout.h index 71925c5..9abbb2a 100644 --- a/variants/ttgo_t_deck_plus/board_pinout.h +++ b/variants/ttgo_t_deck_plus/board_pinout.h @@ -3,13 +3,15 @@ // LoRa Radio #define HAS_SX1262 - #define RADIO_SCLK_PIN 40 - #define RADIO_MISO_PIN 38 - #define RADIO_MOSI_PIN 41 - #define RADIO_CS_PIN 9 - #define RADIO_RST_PIN 17 - #define RADIO_DIO1_PIN 45 - #define RADIO_BUSY_PIN 13 + #define RADIO_SCLK_PIN 40 + #define RADIO_MISO_PIN 38 + #define RADIO_MOSI_PIN 41 + #define RADIO_CS_PIN 9 + #define RADIO_RST_PIN 17 + #define RADIO_DIO1_PIN 45 + #define RADIO_BUSY_PIN 13 + #define RADIO_WAKEUP_PIN RADIO_DIO1_PIN + #define GPIO_WAKEUP_PIN GPIO_SEL_45 // Display #define HAS_DISPLAY @@ -20,18 +22,18 @@ #undef OLED_RST // GPS - #define GPS_RX 43 - #define GPS_TX 44 - #define GPS_BAUDRATE 38400 + #define GPS_RX 43 + #define GPS_TX 44 + #define GPS_BAUDRATE 38400 // Aditional Config - #define BATTERY_PIN 4 + #define BATTERY_PIN 4 - #define BOARD_POWERON 10 - #define BOARD_SDCARD_CS 39 - #define BOARD_BL_PIN 42 + #define BOARD_POWERON 10 + #define BOARD_SDCARD_CS 39 + #define BOARD_BL_PIN 42 - #define BOARD_I2C_SDA 18 - #define BOARD_I2C_SCL 8 + #define BOARD_I2C_SDA 18 + #define BOARD_I2C_SCL 8 #endif \ No newline at end of file