From 17207681ef6e62c459ccf0cc79ef753b13e90316 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 19 Sep 2023 10:55:14 -0500
Subject: [PATCH] Remove GPS pins from devices lacking built-in GPS (#2812)

---
 variants/tlora_t3s3_v1/variant.h | 5 -----
 variants/tlora_v1/variant.h      | 5 +----
 variants/tlora_v1_3/variant.h    | 5 -----
 variants/tlora_v2/variant.h      | 5 -----
 variants/tlora_v2_1_16/variant.h | 7 -------
 variants/tlora_v2_1_18/variant.h | 3 ---
 6 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/variants/tlora_t3s3_v1/variant.h b/variants/tlora_t3s3_v1/variant.h
index 7f914c055..3d500633f 100644
--- a/variants/tlora_t3s3_v1/variant.h
+++ b/variants/tlora_t3s3_v1/variant.h
@@ -1,8 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-
-#define PIN_GPS_EN 42 // GPS power enable pin
-
 #define HAS_SDCARD
 #define SDCARD_USE_SPI1
 
diff --git a/variants/tlora_v1/variant.h b/variants/tlora_v1/variant.h
index b4365a443..08fefa809 100644
--- a/variants/tlora_v1/variant.h
+++ b/variants/tlora_v1/variant.h
@@ -1,6 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-
 #define I2C_SDA 4 // I2C pins for this board
 #define I2C_SCL 15
 
@@ -16,4 +13,4 @@
 #define LORA_DIO0 26 // a No connect on the SX1262 module
 #define LORA_RESET 14
 #define LORA_DIO1 33 // Must be manually wired: https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-3/18436
-#define LORA_DIO2 32 // Not really used
+#define LORA_DIO2 32 // Not really used
\ No newline at end of file
diff --git a/variants/tlora_v1_3/variant.h b/variants/tlora_v1_3/variant.h
index 50041f296..73cb31f27 100644
--- a/variants/tlora_v1_3/variant.h
+++ b/variants/tlora_v1_3/variant.h
@@ -1,8 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 13 // per @eugene
-
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO35_CHANNEL
 
diff --git a/variants/tlora_v2/variant.h b/variants/tlora_v2/variant.h
index b9b521771..8a7cf89ec 100644
--- a/variants/tlora_v2/variant.h
+++ b/variants/tlora_v2/variant.h
@@ -1,8 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 13 // per @eugene
-
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO35_CHANNEL
 
diff --git a/variants/tlora_v2_1_16/variant.h b/variants/tlora_v2_1_16/variant.h
index 30a176e4c..b8c43e557 100644
--- a/variants/tlora_v2_1_16/variant.h
+++ b/variants/tlora_v2_1_16/variant.h
@@ -1,10 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick
-#define GPS_TX_PIN 13
-
-#define PIN_GPS_EN 19 // GPS power enable pin
-
 #define BATTERY_PIN 35
 #define ADC_CHANNEL ADC1_GPIO35_CHANNEL
 #define BATTERY_SENSE_SAMPLES 30
diff --git a/variants/tlora_v2_1_18/variant.h b/variants/tlora_v2_1_18/variant.h
index e8f0a9659..efc676992 100644
--- a/variants/tlora_v2_1_18/variant.h
+++ b/variants/tlora_v2_1_18/variant.h
@@ -1,6 +1,3 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
 #define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.