From 255fce7f659564a9555fc80fb610627f434350ac Mon Sep 17 00:00:00 2001 From: agessaman Date: Fri, 24 Apr 2026 10:32:14 -0700 Subject: [PATCH] feat(heltec_tracker_v2): restore LoRaFEMControl for GC1109 Upstream adds LoRaFEMControl for a KCT8103L pinout; this variant uses GC1109 (P_LORA_PA_*). Reintroduce the class with the same API and wire HeltecTrackerV2Board through it so FEM logic matches platformio.ini. Made-with: Cursor --- .../HeltecTrackerV2Board.cpp | 166 +++++++----------- .../heltec_tracker_v2/HeltecTrackerV2Board.h | 2 + variants/heltec_tracker_v2/LoRaFEMControl.cpp | 44 +++++ variants/heltec_tracker_v2/LoRaFEMControl.h | 21 +++ 4 files changed, 130 insertions(+), 103 deletions(-) create mode 100644 variants/heltec_tracker_v2/LoRaFEMControl.cpp create mode 100644 variants/heltec_tracker_v2/LoRaFEMControl.h diff --git a/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp b/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp index f74d331f9..b7aaa2ce8 100644 --- a/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp +++ b/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp @@ -1,125 +1,85 @@ #include "HeltecTrackerV2Board.h" void HeltecTrackerV2Board::begin() { - ESP32Board::begin(); + ESP32Board::begin(); - pinMode(PIN_ADC_CTRL, OUTPUT); - digitalWrite(PIN_ADC_CTRL, LOW); // Initially inactive + pinMode(PIN_ADC_CTRL, OUTPUT); + digitalWrite(PIN_ADC_CTRL, LOW); - // Set up digital GPIO registers before releasing RTC hold. The hold latches - // the pad state including function select, so register writes accumulate - // without affecting the pad. On hold release, all changes apply atomically - // (IO MUX switches to digital GPIO with output already HIGH — no glitch). - pinMode(P_LORA_PA_POWER, OUTPUT); - digitalWrite(P_LORA_PA_POWER,HIGH); + loRaFEMControl.init(); + + esp_reset_reason_t reason = esp_reset_reason(); + if (reason != ESP_RST_DEEPSLEEP) { + delay(1); + } + + periph_power.begin(); + if (reason == ESP_RST_DEEPSLEEP) { + long wakeup_source = esp_sleep_get_ext1_wakeup_status(); + if (wakeup_source & (1 << P_LORA_DIO_1)) { + startup_reason = BD_STARTUP_RX_PACKET; + } + + rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS); rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_POWER); - - pinMode(P_LORA_PA_EN, OUTPUT); - digitalWrite(P_LORA_PA_EN,HIGH); rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_EN); - pinMode(P_LORA_PA_TX_EN, OUTPUT); - digitalWrite(P_LORA_PA_TX_EN,LOW); + rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1); + } +} - esp_reset_reason_t reason = esp_reset_reason(); - if (reason != ESP_RST_DEEPSLEEP) { - delay(1); // GC1109 startup time after cold power-on - } +void HeltecTrackerV2Board::onBeforeTransmit(void) { + digitalWrite(P_LORA_TX_LED, HIGH); + loRaFEMControl.setTxModeEnable(); +} - periph_power.begin(); - if (reason == ESP_RST_DEEPSLEEP) { - long wakeup_source = esp_sleep_get_ext1_wakeup_status(); - if (wakeup_source & (1 << P_LORA_DIO_1)) { // received a LoRa packet (while in deep sleep) - startup_reason = BD_STARTUP_RX_PACKET; - } +void HeltecTrackerV2Board::onAfterTransmit(void) { + digitalWrite(P_LORA_TX_LED, LOW); + loRaFEMControl.setRxModeEnable(); +} - // Release RTC holds - pins retain their state, no need to reconfigure - rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS); - rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_POWER); - rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_EN); - rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1); - } else { - // Cold boot: Configure GC1109 FEM pins - // Control logic (from GC1109 datasheet): - // Receive LNA: CSD=1, CTX=0, CPS=X (17dB gain, 2dB NF) - // Transmit PA: CSD=1, CTX=1, CPS=1 (full PA enabled) - // Pin mapping: CTX->DIO2 (auto), CSD->GPIO4, CPS->GPIO46, VFEM->GPIO7 +void HeltecTrackerV2Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) { + esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON); - // VFEM_Ctrl (GPIO7): Power enable for GC1109 LDO - pinMode(P_LORA_PA_POWER, OUTPUT); - digitalWrite(P_LORA_PA_POWER, HIGH); + rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY); + rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1); - // CSD (GPIO4): Chip enable - must be HIGH for GC1109 to work - pinMode(P_LORA_PA_EN, OUTPUT); - digitalWrite(P_LORA_PA_EN, HIGH); - } + rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS); - periph_power.begin(); + loRaFEMControl.setRxModeEnableWhenMCUSleep(); - // Note: GPIO46 (CPS) is a strapping pin - do NOT configure it here. - // TX handlers are fully responsible for GPIO46 (see onBeforeTransmit/onAfterTransmit) + if (pin_wake_btn < 0) { + esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); + } else { + esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1) | (1L << pin_wake_btn), + ESP_EXT1_WAKEUP_ANY_HIGH); } - void HeltecTrackerV2Board::onBeforeTransmit(void) { - // GPIO46 is a strapping pin - only drive it when actively transmitting - pinMode(P_LORA_PA_TX_EN, OUTPUT); - digitalWrite(P_LORA_PA_TX_EN, HIGH); // CPS=1: Enable full PA mode - digitalWrite(P_LORA_TX_LED, HIGH); + if (secs > 0) { + esp_sleep_enable_timer_wakeup(secs * 1000000); } - void HeltecTrackerV2Board::onAfterTransmit(void) { - digitalWrite(P_LORA_PA_TX_EN, LOW); - pinMode(P_LORA_PA_TX_EN, INPUT); // Release strapping pin - digitalWrite(P_LORA_TX_LED, LOW); + esp_deep_sleep_start(); +} + +void HeltecTrackerV2Board::powerOff() { + enterDeepSleep(0); +} + +uint16_t HeltecTrackerV2Board::getBattMilliVolts() { + analogReadResolution(10); + digitalWrite(PIN_ADC_CTRL, HIGH); + delay(10); + uint32_t raw = 0; + for (int i = 0; i < 8; i++) { + raw += analogRead(PIN_VBAT_READ); } + raw = raw / 8; - void HeltecTrackerV2Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) { - esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON); + digitalWrite(PIN_ADC_CTRL, LOW); - // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep - rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY); - rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1); + return (5.42 * (3.3 / 1024.0) * raw) * 1000; +} - rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS); - - // Hold GC1109 FEM pins during sleep for RX wake capability - // State: CSD=1, CTX=0 (DIO2), CPS=X -> Receive LNA mode - rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER); // VFEM_Ctrl - keep LDO powered - rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_EN); // CSD=1 - chip enabled - // Note: GPIO46 (CPS) is NOT an RTC GPIO, cannot hold - but CPS is don't care for RX - - if (pin_wake_btn < 0) { - esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH); // wake up on: recv LoRa packet - } else { - esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH); // wake up on: recv LoRa packet OR wake btn - } - - if (secs > 0) { - esp_sleep_enable_timer_wakeup(secs * 1000000); - } - - // Finally set ESP32 into sleep - esp_deep_sleep_start(); // CPU halts here and never returns! - } - - void HeltecTrackerV2Board::powerOff() { - enterDeepSleep(0); - } - - uint16_t HeltecTrackerV2Board::getBattMilliVolts() { - analogReadResolution(10); - digitalWrite(PIN_ADC_CTRL, HIGH); - delay(10); - uint32_t raw = 0; - for (int i = 0; i < 8; i++) { - raw += analogRead(PIN_VBAT_READ); - } - raw = raw / 8; - - digitalWrite(PIN_ADC_CTRL, LOW); - - return (5.42 * (3.3 / 1024.0) * raw) * 1000; - } - - const char* HeltecTrackerV2Board::getManufacturerName() const { - return "Heltec Tracker V2"; - } +const char* HeltecTrackerV2Board::getManufacturerName() const { + return "Heltec Tracker V2"; +} diff --git a/variants/heltec_tracker_v2/HeltecTrackerV2Board.h b/variants/heltec_tracker_v2/HeltecTrackerV2Board.h index d93c86cdd..33c897bc9 100644 --- a/variants/heltec_tracker_v2/HeltecTrackerV2Board.h +++ b/variants/heltec_tracker_v2/HeltecTrackerV2Board.h @@ -4,11 +4,13 @@ #include #include #include +#include "LoRaFEMControl.h" class HeltecTrackerV2Board : public ESP32Board { public: RefCountedDigitalPin periph_power; + LoRaFEMControl loRaFEMControl; HeltecTrackerV2Board() : periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) { } diff --git a/variants/heltec_tracker_v2/LoRaFEMControl.cpp b/variants/heltec_tracker_v2/LoRaFEMControl.cpp new file mode 100644 index 000000000..962c21b95 --- /dev/null +++ b/variants/heltec_tracker_v2/LoRaFEMControl.cpp @@ -0,0 +1,44 @@ +#include "LoRaFEMControl.h" +#include +#include + +// GC1109 FEM (see platformio.ini): VFEM/CSD/CPS on P_LORA_PA_*; CTX from SX1262 DIO2. + +void LoRaFEMControl::init(void) { + pinMode(P_LORA_PA_POWER, OUTPUT); + digitalWrite(P_LORA_PA_POWER, HIGH); + rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_POWER); + + pinMode(P_LORA_PA_EN, OUTPUT); + digitalWrite(P_LORA_PA_EN, HIGH); + rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_EN); + + pinMode(P_LORA_PA_TX_EN, OUTPUT); + digitalWrite(P_LORA_PA_TX_EN, LOW); + + setLnaCanControl(true); +} + +void LoRaFEMControl::setSleepModeEnable(void) { + digitalWrite(P_LORA_PA_EN, LOW); +} + +void LoRaFEMControl::setTxModeEnable(void) { + pinMode(P_LORA_PA_TX_EN, OUTPUT); + digitalWrite(P_LORA_PA_TX_EN, HIGH); +} + +void LoRaFEMControl::setRxModeEnable(void) { + digitalWrite(P_LORA_PA_TX_EN, LOW); + pinMode(P_LORA_PA_TX_EN, INPUT); +} + +void LoRaFEMControl::setRxModeEnableWhenMCUSleep(void) { + digitalWrite(P_LORA_PA_EN, HIGH); + rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_EN); + rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER); +} + +void LoRaFEMControl::setLNAEnable(bool enabled) { + lna_enabled = enabled; +} diff --git a/variants/heltec_tracker_v2/LoRaFEMControl.h b/variants/heltec_tracker_v2/LoRaFEMControl.h new file mode 100644 index 000000000..fe61b7e44 --- /dev/null +++ b/variants/heltec_tracker_v2/LoRaFEMControl.h @@ -0,0 +1,21 @@ +#pragma once +#include + +class LoRaFEMControl +{ + public: + LoRaFEMControl() {} + virtual ~LoRaFEMControl() {} + void init(void); + void setSleepModeEnable(void); + void setTxModeEnable(void); + void setRxModeEnable(void); + void setRxModeEnableWhenMCUSleep(void); + void setLNAEnable(bool enabled); + bool isLnaCanControl(void) { return lna_can_control; } + void setLnaCanControl(bool can_control) { lna_can_control = can_control; } + + private: + bool lna_enabled = true; + bool lna_can_control = false; +};