From 56dd3eab23ae26e867b415c01fa1f3a69346315b Mon Sep 17 00:00:00 2001
From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com>
Date: Tue, 14 Sep 2021 12:25:25 +0300
Subject: [PATCH] use common param name `SX126X_ANT_SW` instead of the
 `SX1262_ANT_SW`

---
 src/main.cpp                         | 14 ++++----------
 variants/lora_relay_v1/variant.h     |  2 +-
 variants/lora_relay_v2/variant.h     |  2 +-
 variants/pca10056-rc-clock/variant.h |  2 +-
 variants/ppr/variant.h               |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e494f9f20..0171631e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -492,16 +492,10 @@ void setup()
         }
     }
 
-#ifdef SX1262_ANT_SW
-    // make analog PA vs not PA switch on SX1262 eval board work properly
-    pinMode(SX1262_ANT_SW, OUTPUT);
-    digitalWrite(SX1262_ANT_SW, 1);
-#endif
-
-#ifdef SX1268_ANT_SW
-    // make analog PA vs not PA switch on SX1268 eval board work properly
-    pinMode(SX1268_ANT_SW, OUTPUT);
-    digitalWrite(SX1268_ANT_SW, 1);
+#ifdef SX126X_ANT_SW
+    // make analog PA vs not PA switch on SX126x eval board work properly
+    pinMode(SX126X_ANT_SW, OUTPUT);
+    digitalWrite(SX126X_ANT_SW, 1);
 #endif
 
     // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
diff --git a/variants/lora_relay_v1/variant.h b/variants/lora_relay_v1/variant.h
index 59a52f44a..74f3c5a68 100644
--- a/variants/lora_relay_v1/variant.h
+++ b/variants/lora_relay_v1/variant.h
@@ -126,7 +126,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX1262_DIO2 (30)
 #define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
 #define SX126X_RESET (34)
-// #define SX1262_ANT_SW (32 + 10)
+// #define SX126X_ANT_SW (32 + 10)
 #define SX126X_RXEN (14)
 #define SX126X_TXEN (31)
 #define SX126X_POWER_EN                                                                                                          \
diff --git a/variants/lora_relay_v2/variant.h b/variants/lora_relay_v2/variant.h
index 04a436739..ec3e7e904 100644
--- a/variants/lora_relay_v2/variant.h
+++ b/variants/lora_relay_v2/variant.h
@@ -146,7 +146,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX1262_DIO2 (30)
 #define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
 #define SX126X_RESET (34)
-// #define SX1262_ANT_SW (32 + 10)
+// #define SX126X_ANT_SW (32 + 10)
 #define SX126X_RXEN (14)
 #define SX126X_TXEN (31)
 #define SX126X_POWER_EN                                                                                                          \
diff --git a/variants/pca10056-rc-clock/variant.h b/variants/pca10056-rc-clock/variant.h
index 185faead8..b9c4f9bfd 100644
--- a/variants/pca10056-rc-clock/variant.h
+++ b/variants/pca10056-rc-clock/variant.h
@@ -144,7 +144,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_DIO1 (32 + 6)    // P1.06
 #define SX126X_BUSY (32 + 4)    // P1.04
 #define SX126X_RESET (0 + 3)    // P0.03
-#define SX1262_ANT_SW (32 + 10) // P1.10
+#define SX126X_ANT_SW (32 + 10) // P1.10
 
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
diff --git a/variants/ppr/variant.h b/variants/ppr/variant.h
index d2a72f879..b055c3d84 100644
--- a/variants/ppr/variant.h
+++ b/variants/ppr/variant.h
@@ -134,7 +134,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX1262_DIO2 (26)
 #define SX126X_BUSY (31) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
 #define SX126X_RESET (17)
-// #define SX1262_ANT_SW (32 + 10)
+// #define SX126X_ANT_SW (32 + 10)
 #define SX126X_RXEN (22)
 #define SX126X_TXEN (24)
 #define SX126X_E22  // Indicates this SX1262 is inside of an ebyte E22 module and special config should be done for that