From 0f6131d2c86beae9e2fe91884b6bcbcd86834938 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Tue, 30 Sep 2025 08:30:18 +1000
Subject: [PATCH] Use common power amp definition for Heltec v4 and Heltec
 Tracker v2

---
 src/configuration.h                                   | 2 +-
 src/mesh/SX126xInterface.cpp                          | 6 +++---
 src/sleep.cpp                                         | 2 +-
 variants/esp32s3/heltec_v4/variant.h                  | 1 +
 variants/esp32s3/heltec_wireless_tracker_v2/variant.h | 8 ++++----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/configuration.h b/src/configuration.h
index 91181890b..e67f0b8e5 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -117,7 +117,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SX126X_MAX_POWER 22
 #endif
 
-#ifdef HELTEC_V4
+#ifdef USE_GC1109_PA
 // Power Amps are often non-linear, so we can use an array of values for the power curve
 #define NUM_PA_POINTS 22
 #define TX_GAIN_LORA 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 9, 8, 7
diff --git a/src/mesh/SX126xInterface.cpp b/src/mesh/SX126xInterface.cpp
index a858c5e3b..c60ef3a80 100644
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -52,7 +52,7 @@ template <typename T> bool SX126xInterface<T>::init()
     pinMode(SX126X_POWER_EN, OUTPUT);
 #endif
 
-#if defined(HELTEC_V4)||defined(HELTEC_WIRELESS_TRACKER_V2)
+#if defined(USE_GC1109_PA)
     pinMode(LORA_PA_POWER, OUTPUT);
     digitalWrite(LORA_PA_POWER, HIGH);
 
@@ -352,7 +352,7 @@ template <typename T> bool SX126xInterface<T>::sleep()
     digitalWrite(SX126X_POWER_EN, LOW);
 #endif
 
-#if defined(HELTEC_V4)||defined(HELTEC_WIRELESS_TRACKER_V2)
+#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.
@@ -367,7 +367,7 @@ template <typename T> bool SX126xInterface<T>::sleep()
 /** Some boards require GPIO control of tx vs rx paths */
 template <typename T> void SX126xInterface<T>::setTransmitEnable(bool txon)
 {
-#if defined(HELTEC_V4)||defined(HELTEC_WIRELESS_TRACKER_V2)
+#if defined(USE_GC1109_PA)
     digitalWrite(LORA_PA_POWER, HIGH);
     digitalWrite(LORA_PA_EN, HIGH);
     digitalWrite(LORA_PA_TX_EN, txon ? 1 : 0);
diff --git a/src/sleep.cpp b/src/sleep.cpp
index cfc8fbcd6..68867e0d0 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -554,7 +554,7 @@ void enableLoraInterrupt()
     gpio_pullup_en((gpio_num_t)LORA_CS);
 #endif
 
-#if defined(HELTEC_V4)||defined(HELTEC_WIRELESS_TRACKER_V2)
+#if defined(USE_GC1109_PA)
     gpio_pullup_en((gpio_num_t)LORA_PA_POWER);
     gpio_pullup_en((gpio_num_t)LORA_PA_EN);
     gpio_pulldown_en((gpio_num_t)LORA_PA_TX_EN);
diff --git a/variants/esp32s3/heltec_v4/variant.h b/variants/esp32s3/heltec_v4/variant.h
index 2b6b7af3d..1c9516e39 100644
--- a/variants/esp32s3/heltec_v4/variant.h
+++ b/variants/esp32s3/heltec_v4/variant.h
@@ -37,6 +37,7 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
+#define USE_GC1109_PA   // We have a GC1109 power amplifier+attenuator
 #define LORA_PA_POWER 7 // power en
 #define LORA_PA_EN 2
 #define LORA_PA_TX_EN 46 // enable tx
diff --git a/variants/esp32s3/heltec_wireless_tracker_v2/variant.h b/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
index 39769f1e0..aec31bba2 100644
--- a/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
+++ b/variants/esp32s3/heltec_wireless_tracker_v2/variant.h
@@ -15,7 +15,7 @@
 #define ST7735_RESET 39
 #define ST7735_MISO -1
 #define ST7735_BUSY -1
-#define TFT_BL 21 
+#define TFT_BL 21
 #define ST7735_SPI_HOST SPI3_HOST
 #define SPI_FREQUENCY 40000000
 #define SPI_READ_FREQUENCY 16000000
@@ -28,7 +28,6 @@
 #define SCREEN_TRANSITION_FRAMERATE 3 // fps
 #define DISPLAY_FORCE_SMALL_FONTS
 
-
 #define VEXT_ENABLE 3 // active HIGH - powers the GPS, GPS LNA and OLED
 #define VEXT_ON_VALUE HIGH
 #define BUTTON_PIN 0
@@ -37,7 +36,7 @@
 #define ADC_CHANNEL ADC1_GPIO1_CHANNEL
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9 * 1.045
-#define ADC_CTRL 2     // active HIGH, powers the voltage divider. 
+#define ADC_CTRL 2     // active HIGH, powers the voltage divider.
 #define ADC_USE_PULLUP // Use internal pullup/pulldown instead of actively driving the output
 
 #undef GPS_RX_PIN
@@ -73,6 +72,7 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
+#define USE_GC1109_PA   // We have a GC1109 power amplifier+attenuator
 #define LORA_PA_POWER 7 // power en
-#define LORA_PA_EN    4
+#define LORA_PA_EN 4
 #define LORA_PA_TX_EN 46 // enable tx
\ No newline at end of file