Add heltec-v4.3 board

src/configuration.h

@@ -163,6 +163,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TX_GAIN_LORA 0
 #endif
 
+#ifndef HAS_LORA_FEM
+#define HAS_LORA_FEM 0
+#endif
+
 // -----------------------------------------------------------------------------
 // Feature toggles
 // -----------------------------------------------------------------------------

src/mesh/LoRaFEMInterface.cpp

@@ -0,0 +1,193 @@
+#if HAS_LORA_FEM
+#include "LoRaFEMInterface.h"
+
+#if defined(ARCH_ESP32)
+#include <driver/rtc_io.h>
+#include <esp_sleep.h>
+#endif
+
+LoRaFEMInterface loraFEMInterface;
+void LoRaFEMInterface::init(void)
+{
+    setLnaCanControl(false); // Default is uncontrollable
+#ifdef HELTEC_V4
+    pinMode(LORA_PA_POWER, OUTPUT);
+    digitalWrite(LORA_PA_POWER, HIGH);
+    rtc_gpio_hold_dis((gpio_num_t)LORA_PA_POWER);
+    delay(1);
+    rtc_gpio_hold_dis((gpio_num_t)LORA_KCT8103L_PA_CSD);
+    pinMode(LORA_KCT8103L_PA_CSD, INPUT); // detect which FEM is used
+    delay(1);
+    if (digitalRead(LORA_KCT8103L_PA_CSD) == HIGH) {
+        // FEM is KCT8103L
+        fem_type = KCT8103L_PA;
+        rtc_gpio_hold_dis((gpio_num_t)LORA_KCT8103L_PA_CTX);
+        pinMode(LORA_KCT8103L_PA_CSD, OUTPUT);
+        digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
+        pinMode(LORA_KCT8103L_PA_CTX, OUTPUT);
+        digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+        setLnaCanControl(true);
+    } else if (digitalRead(LORA_KCT8103L_PA_CSD) == LOW) {
+        // FEM is GC1109
+        fem_type = GC1109_PA;
+        // LORA_GC1109_PA_EN and LORA_KCT8103L_PA_CSD are the same pin and do not need to be repeatedly turned off and held.
+        //  rtc_gpio_hold_dis((gpio_num_t)LORA_GC1109_PA_EN);
+        pinMode(LORA_GC1109_PA_EN, OUTPUT);
+        digitalWrite(LORA_GC1109_PA_EN, HIGH);
+        pinMode(LORA_GC1109_PA_TX_EN, OUTPUT);
+        digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+    } else {
+        fem_type = OTHER_FEM_TYPES;
+    }
+#elif defined(USE_GC1109_PA)
+    fem_type = GC1109_PA;
+#if defined(ARCH_ESP32)
+    rtc_gpio_hold_dis((gpio_num_t)LORA_PA_POWER);
+    rtc_gpio_hold_dis((gpio_num_t)LORA_GC1109_PA_EN);
+    rtc_gpio_hold_dis((gpio_num_t)LORA_GC1109_PA_TX_EN);
+#endif
+    pinMode(LORA_PA_POWER, OUTPUT);
+    digitalWrite(LORA_PA_POWER, HIGH);
+    delay(1);
+    pinMode(LORA_GC1109_PA_EN, OUTPUT);
+    digitalWrite(LORA_GC1109_PA_EN, HIGH);
+    pinMode(LORA_GC1109_PA_TX_EN, OUTPUT);
+    digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+#endif
+}
+
+void LoRaFEMInterface::setSleepModeEnable(void)
+{
+#ifdef HELTEC_V4
+    if (fem_type == GC1109_PA) {
+        /*
+         * Do not switch the power on and off frequently.
+         * After turning off LORA_GC1109_PA_EN, the power consumption has dropped to the uA level.
+         */
+        digitalWrite(LORA_GC1109_PA_EN, LOW);
+        digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+    } else if (fem_type == KCT8103L_PA) {
+        // shutdown the PA
+        digitalWrite(LORA_KCT8103L_PA_CSD, LOW);
+    }
+#elif defined(USE_GC1109_PA)
+    digitalWrite(LORA_GC1109_PA_EN, LOW);
+    digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+#endif
+}
+
+void LoRaFEMInterface::setTxModeEnable(void)
+{
+#ifdef HELTEC_V4
+    if (fem_type == GC1109_PA) {
+        digitalWrite(LORA_GC1109_PA_EN, HIGH);    // CSD=1: Chip enabled
+        digitalWrite(LORA_GC1109_PA_TX_EN, HIGH); // CPS: 1=full PA, 0=bypass (for RX, CPS is don't care)
+    } else if (fem_type == KCT8103L_PA) {
+        digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
+        digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+    }
+#elif defined(USE_GC1109_PA)
+    digitalWrite(LORA_GC1109_PA_EN, HIGH);    // CSD=1: Chip enabled
+    digitalWrite(LORA_GC1109_PA_TX_EN, HIGH); // CPS: 1=full PA, 0=bypass (for RX, CPS is don't care)
+#endif
+}
+
+void LoRaFEMInterface::setRxModeEnable(void)
+{
+#ifdef HELTEC_V4
+    if (fem_type == GC1109_PA) {
+        digitalWrite(LORA_GC1109_PA_EN, HIGH); // CSD=1: Chip enabled
+        digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+    } else if (fem_type == KCT8103L_PA) {
+        digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
+        if (lna_enabled) {
+            digitalWrite(LORA_KCT8103L_PA_CTX, LOW);
+        } else {
+            digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+        }
+    }
+#elif defined(USE_GC1109_PA)
+    digitalWrite(LORA_GC1109_PA_EN, HIGH);    // CSD=1: Chip enabled
+    digitalWrite(LORA_GC1109_PA_TX_EN, LOW);
+#endif
+}
+
+void LoRaFEMInterface::setRxModeEnableWhenMCUSleep(void)
+{
+
+#ifdef HELTEC_V4
+    // Keep GC1109 FEM powered during deep sleep so LNA remains active for RX wake.
+    // Set PA_POWER and PA_EN HIGH (overrides SX126xInterface::sleep() shutdown),
+    // then latch with RTC hold so the state survives deep sleep.
+    digitalWrite(LORA_PA_POWER, HIGH);
+    rtc_gpio_hold_en((gpio_num_t)LORA_PA_POWER);
+    if (fem_type == GC1109_PA) {
+        digitalWrite(LORA_GC1109_PA_EN, HIGH);
+        rtc_gpio_hold_en((gpio_num_t)LORA_GC1109_PA_EN);
+        gpio_pulldown_en((gpio_num_t)LORA_GC1109_PA_TX_EN);
+    } else if (fem_type == KCT8103L_PA) {
+        digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
+        rtc_gpio_hold_en((gpio_num_t)LORA_KCT8103L_PA_CSD);
+        if (lna_enabled) {
+            digitalWrite(LORA_KCT8103L_PA_CTX, LOW);
+        } else {
+            digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+        }
+        rtc_gpio_hold_en((gpio_num_t)LORA_KCT8103L_PA_CTX);
+    }
+#elif defined(USE_GC1109_PA)
+    digitalWrite(LORA_PA_POWER, HIGH);
+    digitalWrite(LORA_GC1109_PA_EN, HIGH);
+#if defined(ARCH_ESP32)
+    rtc_gpio_hold_en((gpio_num_t)LORA_PA_POWER);
+    rtc_gpio_hold_en((gpio_num_t)LORA_GC1109_PA_EN);
+    gpio_pulldown_en((gpio_num_t)LORA_GC1109_PA_TX_EN);
+#endif
+#endif
+}
+
+void LoRaFEMInterface::setLNAEnable(bool enabled)
+{
+    lna_enabled = enabled;
+}
+
+int8_t LoRaFEMInterface::powerConversion(int8_t loraOutputPower)
+{
+#ifdef HELTEC_V4
+    const uint16_t gc1109_tx_gain[] = {11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 9, 8, 7};
+    const uint16_t kct8103l_tx_gain[] = {13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 12, 12, 11, 11, 10, 9, 8, 7};
+    const uint16_t *tx_gain;
+    uint16_t tx_gain_num;
+    if (fem_type == GC1109_PA) {
+        tx_gain = gc1109_tx_gain;
+        tx_gain_num = sizeof(gc1109_tx_gain) / sizeof(gc1109_tx_gain[0]);
+    } else if (fem_type == KCT8103L_PA) {
+        tx_gain = kct8103l_tx_gain;
+        tx_gain_num = sizeof(kct8103l_tx_gain) / sizeof(kct8103l_tx_gain[0]);
+    } else {
+        return loraOutputPower;
+    }
+#else
+#ifdef ARCH_PORTDUINO
+    size_t num_pa_points = portduino_config.num_pa_points;
+    const uint16_t *tx_gain = portduino_config.tx_gain_lora;
+    uint16_t tx_gain_num = num_pa_points;
+#else
+    size_t num_pa_points = NUM_PA_POINTS;
+    const uint16_t tx_gain[NUM_PA_POINTS] = {TX_GAIN_LORA};
+    uint16_t tx_gain_num = NUM_PA_POINTS;
+#endif
+#endif
+    for (int radio_dbm = 0; radio_dbm < tx_gain_num; radio_dbm++) {
+        if (((radio_dbm + tx_gain[radio_dbm]) > loraOutputPower) ||
+            ((radio_dbm == (tx_gain_num - 1)) && ((radio_dbm + tx_gain[radio_dbm]) <= loraOutputPower))) {
+            // we've exceeded the power limit, or hit the max we can do
+            LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", loraOutputPower, tx_gain[radio_dbm]);
+            loraOutputPower -= tx_gain[radio_dbm];
+            break;
+        }
+    }
+    return loraOutputPower;
+}
+
+#endif

src/mesh/LoRaFEMInterface.h

@@ -0,0 +1,30 @@
+#pragma once
+#if HAS_LORA_FEM
+#include "configuration.h"
+#include <stdint.h>
+
+typedef enum { GC1109_PA, KCT8103L_PA, OTHER_FEM_TYPES } LoRaFEMType;
+
+class LoRaFEMInterface
+{
+  public:
+    LoRaFEMInterface() {}
+    virtual ~LoRaFEMInterface() {}
+    void init(void);
+    void setSleepModeEnable(void);
+    void setTxModeEnable(void);
+    void setRxModeEnable(void);
+    void setRxModeEnableWhenMCUSleep(void);
+    void setLNAEnable(bool enabled);
+    int8_t powerConversion(int8_t loraOutputPower);
+    bool isLnaCanControl(void) { return lna_can_control; }
+    void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
+
+  private:
+    LoRaFEMType fem_type;
+    bool lna_enabled = false;
+    bool lna_can_control = false;
+};
+extern LoRaFEMInterface loraFEMInterface;
+
+#endif

src/mesh/RadioInterface.cpp

@@ -915,6 +915,12 @@ void RadioInterface::limitPower(int8_t loraMaxPower)
         power = maxPower;
     }
 
+#if HAS_LORA_FEM
+    if (!devicestate.owner.is_licensed) {
+        power = loraFEMInterface.powerConversion(power);
+    }
+#else
+// todo:All entries containing "lora fem" are grouped together above.
 #ifdef ARCH_PORTDUINO
     size_t num_pa_points = portduino_config.num_pa_points;
     const uint16_t *tx_gain = portduino_config.tx_gain_lora;
@@ -940,7 +946,7 @@ void RadioInterface::limitPower(int8_t loraMaxPower)
             }
         }
     }
-
+#endif
     if (power > loraMaxPower) // Clamp power to maximum defined level
         power = loraMaxPower;
 

src/mesh/RadioInterface.h

@@ -8,6 +8,10 @@
 #include "error.h"
 #include <memory>
 
+#if HAS_LORA_FEM
+#include "LoRaFEMInterface.h"
+#endif
+
 // Forward decl to avoid a direct include of generated config headers / full LoRaConfig definition in this widely-included file.
 typedef struct _meshtastic_Config_LoRaConfig meshtastic_Config_LoRaConfig;
 

src/mesh/SX126xInterface.cpp

@@ -6,7 +6,7 @@
 #ifdef ARCH_PORTDUINO
 #include "PortduinoGlue.h"
 #endif
-#if defined(USE_GC1109_PA) && defined(ARCH_ESP32)
+#if defined(ARCH_ESP32)
 #include <driver/rtc_io.h>
 #include <esp_sleep.h>
 #endif
@@ -56,41 +56,8 @@ template <typename T> bool SX126xInterface<T>::init()
     pinMode(SX126X_POWER_EN, OUTPUT);
 #endif
 
-#if defined(USE_GC1109_PA)
-    // GC1109 FEM chip initialization
-    // See variant.h for full pin mapping and control logic documentation
-    //
-    // On deep sleep wake, PA_POWER and PA_EN are held HIGH by RTC latch (set in
-    // enableLoraInterrupt). We configure GPIO registers before releasing the hold
-    // so the pad transitions atomically from held-HIGH to register-HIGH with no
-    // power glitch. On cold boot the hold_dis is a harmless no-op.
-
-    // VFEM_Ctrl (LORA_PA_POWER): Power enable for GC1109 LDO (always on)
-    pinMode(LORA_PA_POWER, OUTPUT);
-    digitalWrite(LORA_PA_POWER, HIGH);
-    rtc_gpio_hold_dis((gpio_num_t)LORA_PA_POWER);
-
-    // TLV75733P LDO has ~550us startup time (datasheet tSTR). On cold boot, wait
-    // for VBAT to stabilise before driving CSD/CPS, per GC1109 requirement:
-    // "VBAT must be prior to CSD/CPS/CTX for the power on sequence"
-    // On deep sleep wake the LDO was held on via RTC latch, so no delay needed.
-#if defined(ARCH_ESP32)
-    if (esp_sleep_get_wakeup_cause() == ESP_SLEEP_WAKEUP_UNDEFINED) {
-        delayMicroseconds(1000);
-    }
-#else
-    delayMicroseconds(1000);
-#endif
-
-    // CSD (LORA_PA_EN): Chip enable - must be HIGH to enable GC1109 for both RX and TX
-    pinMode(LORA_PA_EN, OUTPUT);
-    digitalWrite(LORA_PA_EN, HIGH);
-    rtc_gpio_hold_dis((gpio_num_t)LORA_PA_EN);
-
-    // CPS (LORA_PA_TX_EN): PA mode select - HIGH enables full PA during TX, LOW for RX (don't care)
-    // Note: TX/RX path switching (CTX) is handled by DIO2 via SX126X_DIO2_AS_RF_SWITCH
-    pinMode(LORA_PA_TX_EN, OUTPUT);
-    digitalWrite(LORA_PA_TX_EN, LOW); // Start in RX-ready state
+#if HAS_LORA_FEM
+    loraFEMInterface.init();
 #endif
 
 #ifdef RF95_FAN_EN
@@ -419,15 +386,10 @@ template <typename T> bool SX126xInterface<T>::sleep()
     digitalWrite(SX126X_POWER_EN, LOW);
 #endif
 
-#if defined(USE_GC1109_PA)
-    /*
-     * Do not switch the power on and off frequently.
-     * After turning off LORA_PA_EN, the power consumption has dropped to the uA level.
-     *  // digitalWrite(LORA_PA_POWER, LOW);
-     */
-    digitalWrite(LORA_PA_EN, LOW);
-    digitalWrite(LORA_PA_TX_EN, LOW);
+#if HAS_LORA_FEM
+    loraFEMInterface.setSleepModeEnable();
 #endif
+
     return true;
 }
 
@@ -489,10 +451,12 @@ template <typename T> void SX126xInterface<T>::resetAGC()
 /** Control PA mode for GC1109 FEM - CPS pin selects full PA (txon=true) or bypass mode (txon=false) */
 template <typename T> void SX126xInterface<T>::setTransmitEnable(bool txon)
 {
-#if defined(USE_GC1109_PA)
-    digitalWrite(LORA_PA_POWER, HIGH);         // Ensure LDO is on
-    digitalWrite(LORA_PA_EN, HIGH);            // CSD=1: Chip enabled
-    digitalWrite(LORA_PA_TX_EN, txon ? 1 : 0); // CPS: 1=full PA, 0=bypass (for RX, CPS is don't care)
+#if HAS_LORA_FEM
+    if (txon) {
+        loraFEMInterface.setTxModeEnable();
+    } else {
+        loraFEMInterface.setRxModeEnable();
+    }
 #endif
 }
 

src/sleep.cpp

@@ -163,13 +163,6 @@ void initDeepSleep()
     if (wakeCause != ESP_SLEEP_WAKEUP_UNDEFINED) {
         LOG_DEBUG("Disable any holds on RTC IO pads");
         for (uint8_t i = 0; i <= GPIO_NUM_MAX; i++) {
-#if defined(USE_GC1109_PA)
-            // Skip GC1109 FEM power pins - they are held HIGH during deep sleep to keep
-            // the LNA active for RX wake. Released later in SX126xInterface::init() after
-            // GPIO registers are set HIGH first, avoiding a power glitch.
-            if (i == LORA_PA_POWER || i == LORA_PA_EN)
-                continue;
-#endif
             if (rtc_gpio_is_valid_gpio((gpio_num_t)i))
                 rtc_gpio_hold_dis((gpio_num_t)i);
 
@@ -567,15 +560,8 @@ void enableLoraInterrupt()
     gpio_pullup_en((gpio_num_t)LORA_CS);
 #endif
 
-#if defined(USE_GC1109_PA)
-    // Keep GC1109 FEM powered during deep sleep so LNA remains active for RX wake.
-    // Set PA_POWER and PA_EN HIGH (overrides SX126xInterface::sleep() shutdown),
-    // then latch with RTC hold so the state survives deep sleep.
-    digitalWrite(LORA_PA_POWER, HIGH);
-    rtc_gpio_hold_en((gpio_num_t)LORA_PA_POWER);
-    digitalWrite(LORA_PA_EN, HIGH);
-    rtc_gpio_hold_en((gpio_num_t)LORA_PA_EN);
-    gpio_pulldown_en((gpio_num_t)LORA_PA_TX_EN);
+#if HAS_LORA_FEM
+    loraFEMInterface.setRxModeEnableWhenMCUSleep();
 #endif
 
     LOG_INFO("setup LORA_DIO1 (GPIO%02d) with wakeup by gpio interrupt", LORA_DIO1);

variants/esp32s3/heltec_v4/platformio.ini

@@ -6,6 +6,7 @@ board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
   -D HELTEC_V4
+  -D HAS_LORA_FEM=1
   -I variants/esp32s3/heltec_v4