Remove unused RX boosted gain mode functions and related preprocessor directives across multiple variants

examples/companion_radio/MyMesh.cpp

@@ -894,11 +894,9 @@ void MyMesh::begin(bool has_display) {
 
   radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_set_tx_power(_prefs.tx_power_dbm);
-#if defined(USE_SX1262) || defined(USE_SX1268)
-  radio_set_rx_boosted_gain_mode(_prefs.rx_boosted_gain);
-  MESH_DEBUG_PRINTLN("SX126x RX Boosted Gain Mode: %s",
-                     radio_get_rx_boosted_gain_mode() ? "Enabled" : "Disabled");
-#endif
+  radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
+  MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
+                     radio_driver.getRxBoostedGainMode() ? "Enabled" : "Disabled");
 }
 
 const char *MyMesh::getNodeName() {

examples/simple_repeater/MyMesh.cpp

@@ -919,11 +919,9 @@ void MyMesh::begin(FILESYSTEM *fs) {
   radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_set_tx_power(_prefs.tx_power_dbm);
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-  radio_set_rx_boosted_gain_mode(_prefs.rx_boosted_gain);
-  MESH_DEBUG_PRINTLN("SX126x RX Boosted Gain Mode: %s",
-                     radio_get_rx_boosted_gain_mode() ? "Enabled" : "Disabled");
-#endif
+  radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
+  MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
+                     radio_driver.getRxBoostedGainMode() ? "Enabled" : "Disabled");
 
   updateAdvertTimer();
   updateFloodAdvertTimer();

src/helpers/radiolib/CustomLLCC68.h

@@ -84,4 +84,10 @@ class CustomLLCC68 : public LLCC68 {
       bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
       return detected;
     }
+
+    bool getRxBoostedGainMode() {
+      uint8_t rxGain = 0;
+      readRegister(RADIOLIB_SX126X_REG_RX_GAIN, &rxGain, 1);
+      return (rxGain == RADIOLIB_SX126X_RX_GAIN_BOOSTED);
+    }
 };

src/helpers/radiolib/CustomLLCC68Wrapper.h

@@ -22,4 +22,11 @@ public:
   }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
+
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomLLCC68 *)_radio)->setRxBoostedGainMode(en);
+  }
+  bool getRxBoostedGainMode() const override {
+    return ((CustomLLCC68 *)_radio)->getRxBoostedGainMode();
+  }
 };

src/helpers/radiolib/CustomLR1110Wrapper.h

@@ -24,5 +24,11 @@ public:
 
   float getLastRSSI() const override { return ((CustomLR1110 *)_radio)->getRSSI(); }
   float getLastSNR() const override { return ((CustomLR1110 *)_radio)->getSNR(); }
-  int16_t setRxBoostedGainMode(bool en) { return ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en); };
+
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en);
+  }
+  bool getRxBoostedGainMode() const override {
+    return ((CustomLR1110 *)_radio)->getRxBoostedGainMode();
+  }
 };

src/helpers/radiolib/CustomSX1262Wrapper.h

@@ -29,4 +29,11 @@ public:
   }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
+
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomSX1262 *)_radio)->setRxBoostedGainMode(en);
+  }
+  bool getRxBoostedGainMode() const override {
+    return ((CustomSX1262 *)_radio)->getRxBoostedGainMode();
+  }
 };

src/helpers/radiolib/CustomSX1268Wrapper.h

@@ -26,4 +26,11 @@ public:
   }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
+
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomSX1268 *)_radio)->setRxBoostedGainMode(en);
+  }
+  bool getRxBoostedGainMode() const override {
+    return ((CustomSX1268 *)_radio)->getRxBoostedGainMode();
+  }
 };

src/helpers/radiolib/RadioLibWrappers.h

@@ -54,6 +54,9 @@ public:
   virtual float getLastSNR() const override;
 
   float packetScore(float snr, int packet_len) override { return packetScoreInt(snr, 10, packet_len); }  // assume sf=10
+
+  virtual void setRxBoostedGainMode(bool) { }
+  virtual bool getRxBoostedGainMode() const { return false; }
 };
 
 /**

variants/ebyte_eora_s3/platformio.ini

@@ -30,7 +30,6 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/ebyte_eora_s3/target.cpp

@@ -83,13 +83,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/ebyte_eora_s3/target.h

@@ -27,8 +27,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/generic-e22/platformio.ini

@@ -33,7 +33,6 @@ build_src_filter = ${Generic_E22.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Generic_E22.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -80,7 +79,6 @@ build_src_filter = ${Generic_E22.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Generic_E22.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -103,7 +101,6 @@ build_src_filter = ${Generic_E22.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Generic_E22.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -150,7 +147,6 @@ build_src_filter = ${Generic_E22.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Generic_E22.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22

variants/generic-e22/target.cpp

@@ -47,12 +47,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/generic-e22/target.h

@@ -20,7 +20,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_ct62/platformio.ini

@@ -5,7 +5,6 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/heltec_ct62
   -D HELTEC_HT_CT62=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D ESP32_CPU_FREQ=80

variants/heltec_ct62/target.cpp

@@ -35,13 +35,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_ct62/target.h

@@ -18,8 +18,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_e213/platformio.ini

@@ -6,7 +6,6 @@ build_flags =
   -I variants/heltec_e213
   -D Vision_Master_E213
   -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_DIO_1=14

variants/heltec_e213/target.cpp

@@ -52,13 +52,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_e213/target.h

@@ -27,8 +27,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_e290/platformio.ini

@@ -6,7 +6,6 @@ build_flags =
   -I variants/heltec_e290
   -D Vision_Master_E290
   -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_e290/target.cpp

@@ -52,13 +52,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_e290/target.h

@@ -27,8 +27,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_mesh_solar/platformio.ini

@@ -9,7 +9,6 @@ build_flags =  ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -I variants/heltec_mesh_solar
   -D HELTEC_MESH_SOLAR
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_mesh_solar/target.cpp

@@ -121,13 +121,3 @@ bool SolarSensorManager::setSettingValue(const char* name, const char* value) {
   }
   return false;  // not supported
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_mesh_solar/target.h

@@ -44,8 +44,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_t114/platformio.ini

@@ -21,7 +21,6 @@ build_flags = ${nrf52_base.build_flags}
   -D P_LORA_MISO=23
   -D P_LORA_MOSI=22
   -D P_LORA_TX_LED=35
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_t114/target.cpp

@@ -62,13 +62,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_t114/target.h

@@ -33,8 +33,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_t190/platformio.ini

@@ -6,7 +6,6 @@ build_flags =
   -I variants/heltec_t190
   -I src/helpers/ui
   -D HELTEC_VISION_MASTER_T190
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_DIO_1=14

variants/heltec_t190/target.cpp

@@ -52,13 +52,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_t190/target.h

@@ -27,8 +27,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_tracker/platformio.ini

@@ -14,7 +14,6 @@ build_flags =
   -D P_LORA_SCLK=9
   -D P_LORA_MISO=11
   -D P_LORA_MOSI=10
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_tracker/target.cpp

@@ -123,13 +123,3 @@ bool HWTSensorManager::setSettingValue(const char* name, const char* value) {
   }
   return false;  // not supported
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_tracker/target.h

@@ -46,8 +46,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_tracker_v2/platformio.ini

@@ -7,7 +7,6 @@ build_flags =
   -I variants/heltec_tracker_v2
   -D HELTEC_TRACKER_V2
   -D ESP32_CPU_FREQ=160
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_TX_LED=18

variants/heltec_tracker_v2/target.cpp

@@ -59,12 +59,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_tracker_v2/target.h

@@ -29,7 +29,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_v3/platformio.ini

@@ -14,7 +14,6 @@ build_flags =
   -D P_LORA_SCLK=9
   -D P_LORA_MISO=11
   -D P_LORA_MOSI=10
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_v3/target.cpp

@@ -59,12 +59,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_v3/target.h

@@ -28,8 +28,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_v4/platformio.ini

@@ -7,7 +7,6 @@ build_flags =
   -I variants/heltec_v4
   -D HELTEC_LORA_V4
   -D ESP32_CPU_FREQ=80
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_TX_LED=35

variants/heltec_v4/target.cpp

@@ -59,12 +59,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_v4/target.h

@@ -33,7 +33,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/heltec_wireless_paper/platformio.ini

@@ -13,7 +13,6 @@ build_flags =
   -D P_LORA_SCLK=9
   -D P_LORA_MISO=11
   -D P_LORA_MOSI=10
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/heltec_wireless_paper/target.cpp

@@ -52,12 +52,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng); // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/heltec_wireless_paper/target.h

@@ -27,8 +27,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/ikoka_handheld_nrf/platformio.ini

@@ -9,7 +9,6 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/ikoka_handheld_nrf
   -UENV_INCLUDE_GPS
   -D IKOKA_NRF52
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_TX_LED=11

variants/ikoka_handheld_nrf/target.cpp

@@ -45,12 +45,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng); // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/ikoka_handheld_nrf/target.h

@@ -28,7 +28,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/ikoka_nano_nrf/platformio.ini

@@ -11,7 +11,6 @@ build_flags = ${nrf52_base.build_flags}
   -I src/helpers/nrf52
   -D P_LORA_TX_LED=11
   -D DISPLAY_CLASS=NullDisplayDriver
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_DIO_1=D1

variants/ikoka_nano_nrf/target.cpp

@@ -43,12 +43,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/ikoka_nano_nrf/target.h

@@ -27,7 +27,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/ikoka_stick_nrf/platformio.ini

@@ -12,7 +12,6 @@ build_flags = ${nrf52_base.build_flags}
   -D P_LORA_TX_LED=11
   -D DISPLAY_CLASS=SSD1306Display
   -D DISPLAY_ROTATION=2
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_DIO_1=D1

variants/ikoka_stick_nrf/target.cpp

@@ -43,12 +43,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/ikoka_stick_nrf/target.h

@@ -27,7 +27,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/keepteen_lt1/platformio.ini

@@ -4,7 +4,6 @@ board = keepteen_lt1
 build_flags = ${nrf52_base.build_flags}
   -I variants/keepteen_lt1
   -D KEEPTEEN_LT1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/keepteen_lt1/target.cpp

@@ -49,13 +49,4 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
 

variants/keepteen_lt1/target.h

@@ -29,7 +29,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_t3s3/platformio.ini

@@ -22,7 +22,6 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_t3s3/target.cpp

@@ -47,12 +47,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_t3s3/target.h

@@ -28,7 +28,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_tbeam_1w/platformio.ini

@@ -8,7 +8,6 @@ build_flags =
 
   ; Radio - SX1262 with high-power PA (32dBm max output)
   ; Note: Set SX1262 output to 22dBm max, external PA provides additional gain
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_DIO_1=1

variants/lilygo_tbeam_1w/target.cpp

@@ -63,12 +63,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_tbeam_1w/target.h

@@ -26,7 +26,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_tbeam_SX1262/platformio.ini

@@ -9,7 +9,6 @@ build_flags =
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D DISPLAY_CLASS=SSD1306Display

variants/lilygo_tbeam_SX1262/target.cpp

@@ -54,12 +54,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_tbeam_SX1262/target.h

@@ -28,7 +28,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_tbeam_supreme_SX1262/platformio.ini

@@ -7,7 +7,6 @@ build_flags =
   -D TBEAM_SUPREME_SX1262
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D DISPLAY_CLASS=SH1106Display

variants/lilygo_tbeam_supreme_SX1262/target.cpp

@@ -51,12 +51,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_tbeam_supreme_SX1262/target.h

@@ -25,8 +25,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_tdeck/platformio.ini

@@ -11,7 +11,6 @@ build_flags =
   -D ARDUINO_USB_CDC_ON_BOOT=1
   -D PIN_USER_BTN=0  ; Trackball button
   -D PIN_PERF_POWERON=10 ; Peripheral power pin
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_tdeck/target.cpp

@@ -53,13 +53,3 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
 }
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_tdeck/target.h

@@ -29,8 +29,3 @@ uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_techo/platformio.ini

@@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -D LILYGO_TECHO
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_techo/target.cpp

@@ -51,13 +51,4 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
 

variants/lilygo_techo/target.h

@@ -30,7 +30,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_techo_lite/platformio.ini

@@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -D LILYGO_TECHO
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_techo_lite/target.cpp

@@ -50,13 +50,4 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
 

variants/lilygo_techo_lite/target.h

@@ -30,7 +30,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/lilygo_tlora_c6/platformio.ini

@@ -23,7 +23,6 @@ build_flags =
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_tlora_c6/target.cpp

@@ -47,12 +47,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/lilygo_tlora_c6/target.h

@@ -19,7 +19,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/m5stack_unit_c6l/UnitC6LBoard.cpp

@@ -48,12 +48,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/m5stack_unit_c6l/platformio.ini

@@ -22,7 +22,6 @@ build_flags =
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/m5stack_unit_c6l/target.h

@@ -18,8 +18,4 @@ bool radio_init();
 uint32_t radio_get_rng_seed();
 void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif
+mesh::LocalIdentity radio_new_identity();

variants/mesh_pocket/platformio.ini

@@ -9,7 +9,6 @@ build_flags =  ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -I variants/mesh_pocket
   -D HELTEC_MESH_POCKET
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/mesh_pocket/target.cpp

@@ -43,12 +43,3 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif

variants/mesh_pocket/target.h

@@ -31,8 +31,4 @@ mesh::LocalIdentity radio_new_identity();
 
 extern SensorManager sensors;
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif
 

variants/meshadventurer/platformio.ini

@@ -41,7 +41,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -90,7 +89,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -114,7 +112,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -163,7 +160,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -190,7 +186,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
 build_flags =
   ${Meshadventurer.build_flags}
   -I examples/companion_radio/ui-new
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -213,7 +208,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
 build_flags =
   ${Meshadventurer.build_flags}
   -I examples/companion_radio/ui-new
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -232,7 +226,6 @@ lib_deps =
 extends = Meshadventurer
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -251,7 +244,6 @@ lib_deps =
 extends = Meshadventurer
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -279,7 +271,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
 build_flags =
   ${Meshadventurer.build_flags}
   -I examples/companion_radio/ui-new
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -302,7 +293,6 @@ build_src_filter = ${Meshadventurer.build_src_filter}
 build_flags =
   ${Meshadventurer.build_flags}
   -I examples/companion_radio/ui-new
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -321,7 +311,6 @@ lib_deps =
 extends = Meshadventurer
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22
@@ -340,7 +329,6 @@ lib_deps =
 extends = Meshadventurer
 build_flags =
   ${Meshadventurer.build_flags}
-  -D USE_SX1268
   -D RADIO_CLASS=CustomSX1268
   -D WRAPPER_CLASS=CustomSX1268Wrapper
   -D LORA_TX_POWER=22

variants/meshadventurer/target.cpp

@@ -50,15 +50,6 @@ mesh::LocalIdentity radio_new_identity() {
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
 
 void MASensorManager::start_gps() {
   if(!gps_active) {

variants/meshadventurer/target.h

@@ -48,7 +48,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/meshtiny/platformio.ini

@@ -6,7 +6,6 @@ build_flags = ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -I variants/meshtiny
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/meshtiny/target.cpp

@@ -44,13 +44,4 @@ void radio_set_tx_power(int8_t dbm) {
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
-}
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
+}

variants/meshtiny/target.h

@@ -32,7 +32,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/nano_g2_ultra/platformio.ini

@@ -17,7 +17,6 @@ board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52840_g2_ultra.build_flags}
   -I variants/nano_g2_ultra
   -D NANO_G2_ULTRA
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/nano_g2_ultra/target.cpp

@@ -140,13 +140,4 @@ bool NanoG2UltraSensorManager::setSettingValue(const char *name, const char *val
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng); // create new random identity
-}
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
+}

variants/nano_g2_ultra/target.h

@@ -48,7 +48,3 @@ void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
 void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-bool radio_get_rx_boosted_gain_mode();
-void radio_set_rx_boosted_gain_mode(bool rxbgm);
-#endif

variants/nibble_screen_connect/platformio.ini

@@ -22,7 +22,6 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/nibble_screen_connect/target.cpp

@@ -42,18 +42,8 @@ void radio_set_tx_power(int8_t dbm) {
   radio.setOutputPower(dbm);
 }
 
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);
-}
-
-#if defined(USE_SX1262) || defined(USE_SX1268)
-void radio_set_rx_boosted_gain_mode(bool rxbgm) {
-  radio.setRxBoostedGainMode(rxbgm);
-}
-
-bool radio_get_rx_boosted_gain_mode() {
-  return radio.getRxBoostedGainMode();
-}
-#endif
+mesh::LocalIdentity radio_new_identity() {
+  RadioNoiseListener rng(radio);
+  return mesh::LocalIdentity(&rng);
+}