diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index 6c3d6633..97a94a75 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/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() { diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp index 08e1b41e..1218de73 100644 --- a/examples/simple_repeater/MyMesh.cpp +++ b/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(); diff --git a/src/helpers/radiolib/CustomLLCC68.h b/src/helpers/radiolib/CustomLLCC68.h index c239cc41..74268cb8 100644 --- a/src/helpers/radiolib/CustomLLCC68.h +++ b/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); + } }; \ No newline at end of file diff --git a/src/helpers/radiolib/CustomLLCC68Wrapper.h b/src/helpers/radiolib/CustomLLCC68Wrapper.h index 9e783a95..fc0975cf 100644 --- a/src/helpers/radiolib/CustomLLCC68Wrapper.h +++ b/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(); + } }; diff --git a/src/helpers/radiolib/CustomLR1110Wrapper.h b/src/helpers/radiolib/CustomLR1110Wrapper.h index a1e0a493..42d36440 100644 --- a/src/helpers/radiolib/CustomLR1110Wrapper.h +++ b/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(); + } }; diff --git a/src/helpers/radiolib/CustomSX1262Wrapper.h b/src/helpers/radiolib/CustomSX1262Wrapper.h index 97630671..6499deb2 100644 --- a/src/helpers/radiolib/CustomSX1262Wrapper.h +++ b/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(); + } }; diff --git a/src/helpers/radiolib/CustomSX1268Wrapper.h b/src/helpers/radiolib/CustomSX1268Wrapper.h index 1370f4cc..54c37ee8 100644 --- a/src/helpers/radiolib/CustomSX1268Wrapper.h +++ b/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(); + } }; diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h index b338b03a..a42e060a 100644 --- a/src/helpers/radiolib/RadioLibWrappers.h +++ b/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; } }; /** diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini index d807b978..bdf6bba3 100644 --- a/variants/ebyte_eora_s3/platformio.ini +++ b/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 diff --git a/variants/ebyte_eora_s3/target.cpp b/variants/ebyte_eora_s3/target.cpp index 4e3eeeb6..501f560b 100644 --- a/variants/ebyte_eora_s3/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/ebyte_eora_s3/target.h b/variants/ebyte_eora_s3/target.h index 553326f9..892c3de3 100644 --- a/variants/ebyte_eora_s3/target.h +++ b/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 \ No newline at end of file diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index 5b646e7f..6b7bfd4e 100644 --- a/variants/generic-e22/platformio.ini +++ b/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 diff --git a/variants/generic-e22/target.cpp b/variants/generic-e22/target.cpp index bfd97167..d4169b09 100644 --- a/variants/generic-e22/target.cpp +++ b/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 diff --git a/variants/generic-e22/target.h b/variants/generic-e22/target.h index 30c2c86a..6504078c 100644 --- a/variants/generic-e22/target.h +++ b/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 diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini index 910385ec..1f2e330a 100644 --- a/variants/heltec_ct62/platformio.ini +++ b/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 diff --git a/variants/heltec_ct62/target.cpp b/variants/heltec_ct62/target.cpp index 1c6c2708..0d5e1b12 100644 --- a/variants/heltec_ct62/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_ct62/target.h b/variants/heltec_ct62/target.h index 1ba2fdbf..1bd525e1 100644 --- a/variants/heltec_ct62/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini index a9f54137..caba3a30 100644 --- a/variants/heltec_e213/platformio.ini +++ b/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 diff --git a/variants/heltec_e213/target.cpp b/variants/heltec_e213/target.cpp index d7a14b58..c9233431 100644 --- a/variants/heltec_e213/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_e213/target.h b/variants/heltec_e213/target.h index 054d6269..c23ac1fa 100644 --- a/variants/heltec_e213/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini index 1d08b63a..0c07c592 100644 --- a/variants/heltec_e290/platformio.ini +++ b/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 diff --git a/variants/heltec_e290/target.cpp b/variants/heltec_e290/target.cpp index bf40f1de..b0c9630c 100644 --- a/variants/heltec_e290/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_e290/target.h b/variants/heltec_e290/target.h index 8c60b014..b0900302 100644 --- a/variants/heltec_e290/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini index abe1148c..7bfbac85 100644 --- a/variants/heltec_mesh_solar/platformio.ini +++ b/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 diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp index 91865fb0..9852b68f 100644 --- a/variants/heltec_mesh_solar/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_mesh_solar/target.h b/variants/heltec_mesh_solar/target.h index 8463c541..f1921abf 100644 --- a/variants/heltec_mesh_solar/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini index 62f804f0..b985030f 100644 --- a/variants/heltec_t114/platformio.ini +++ b/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 diff --git a/variants/heltec_t114/target.cpp b/variants/heltec_t114/target.cpp index 24df2b47..6a30a4d1 100644 --- a/variants/heltec_t114/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_t114/target.h b/variants/heltec_t114/target.h index 2a8f3e57..612161fe 100644 --- a/variants/heltec_t114/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini index 4b034032..8d21c523 100644 --- a/variants/heltec_t190/platformio.ini +++ b/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 diff --git a/variants/heltec_t190/target.cpp b/variants/heltec_t190/target.cpp index 2fea3e13..d22f8b8c 100644 --- a/variants/heltec_t190/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_t190/target.h b/variants/heltec_t190/target.h index b378a516..9a6e4d96 100644 --- a/variants/heltec_t190/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index e0a8f5fa..1dbda126 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/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 diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp index 0256be5c..f801bacb 100644 --- a/variants/heltec_tracker/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index 081300b9..29099f46 100644 --- a/variants/heltec_tracker/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini index 18ee8628..af41b4f5 100644 --- a/variants/heltec_tracker_v2/platformio.ini +++ b/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 diff --git a/variants/heltec_tracker_v2/target.cpp b/variants/heltec_tracker_v2/target.cpp index 90426135..485887b2 100644 --- a/variants/heltec_tracker_v2/target.cpp +++ b/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 diff --git a/variants/heltec_tracker_v2/target.h b/variants/heltec_tracker_v2/target.h index 042d6127..62f31c95 100644 --- a/variants/heltec_tracker_v2/target.h +++ b/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 diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 803ee683..4d299104 100644 --- a/variants/heltec_v3/platformio.ini +++ b/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 diff --git a/variants/heltec_v3/target.cpp b/variants/heltec_v3/target.cpp index c4dd09cb..7c429886 100644 --- a/variants/heltec_v3/target.cpp +++ b/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 diff --git a/variants/heltec_v3/target.h b/variants/heltec_v3/target.h index 6371d1a4..21a209f9 100644 --- a/variants/heltec_v3/target.h +++ b/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 \ No newline at end of file diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index 74c8ef9c..71ffc2e6 100644 --- a/variants/heltec_v4/platformio.ini +++ b/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 diff --git a/variants/heltec_v4/target.cpp b/variants/heltec_v4/target.cpp index 22b7ee25..d08d7572 100644 --- a/variants/heltec_v4/target.cpp +++ b/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 diff --git a/variants/heltec_v4/target.h b/variants/heltec_v4/target.h index f95da39f..47d493cb 100644 --- a/variants/heltec_v4/target.h +++ b/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 diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini index 1a913a43..f0bca860 100644 --- a/variants/heltec_wireless_paper/platformio.ini +++ b/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 diff --git a/variants/heltec_wireless_paper/target.cpp b/variants/heltec_wireless_paper/target.cpp index a12d61c1..ffb042cf 100644 --- a/variants/heltec_wireless_paper/target.cpp +++ b/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 diff --git a/variants/heltec_wireless_paper/target.h b/variants/heltec_wireless_paper/target.h index 1150d153..661da5e4 100644 --- a/variants/heltec_wireless_paper/target.h +++ b/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 \ No newline at end of file diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini index 9f48cd41..821b0057 100644 --- a/variants/ikoka_handheld_nrf/platformio.ini +++ b/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 diff --git a/variants/ikoka_handheld_nrf/target.cpp b/variants/ikoka_handheld_nrf/target.cpp index a644f38c..f1d00f89 100644 --- a/variants/ikoka_handheld_nrf/target.cpp +++ b/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 diff --git a/variants/ikoka_handheld_nrf/target.h b/variants/ikoka_handheld_nrf/target.h index aeaeccea..9afe937a 100644 --- a/variants/ikoka_handheld_nrf/target.h +++ b/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 diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini index 0edfbc72..08b1101b 100644 --- a/variants/ikoka_nano_nrf/platformio.ini +++ b/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 diff --git a/variants/ikoka_nano_nrf/target.cpp b/variants/ikoka_nano_nrf/target.cpp index 9ca647d2..c66bb23f 100644 --- a/variants/ikoka_nano_nrf/target.cpp +++ b/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 diff --git a/variants/ikoka_nano_nrf/target.h b/variants/ikoka_nano_nrf/target.h index 40af8d15..b85b8d93 100644 --- a/variants/ikoka_nano_nrf/target.h +++ b/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 diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini index 2fbafd2a..2e43b700 100644 --- a/variants/ikoka_stick_nrf/platformio.ini +++ b/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 diff --git a/variants/ikoka_stick_nrf/target.cpp b/variants/ikoka_stick_nrf/target.cpp index d1192726..d9eab82e 100644 --- a/variants/ikoka_stick_nrf/target.cpp +++ b/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 diff --git a/variants/ikoka_stick_nrf/target.h b/variants/ikoka_stick_nrf/target.h index 678db255..b36c8393 100644 --- a/variants/ikoka_stick_nrf/target.h +++ b/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 diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini index b82ceb7e..cb3ea9c8 100644 --- a/variants/keepteen_lt1/platformio.ini +++ b/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 diff --git a/variants/keepteen_lt1/target.cpp b/variants/keepteen_lt1/target.cpp index 504b52c4..03d802cf 100644 --- a/variants/keepteen_lt1/target.cpp +++ b/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 diff --git a/variants/keepteen_lt1/target.h b/variants/keepteen_lt1/target.h index be485c86..a37ac8ff 100644 --- a/variants/keepteen_lt1/target.h +++ b/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 diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini index 1fefcece..0f01c9b7 100644 --- a/variants/lilygo_t3s3/platformio.ini +++ b/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 diff --git a/variants/lilygo_t3s3/target.cpp b/variants/lilygo_t3s3/target.cpp index a8bbd313..a6a24369 100644 --- a/variants/lilygo_t3s3/target.cpp +++ b/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 diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h index 2d374c13..7db1b664 100644 --- a/variants/lilygo_t3s3/target.h +++ b/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 diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini index 40d87c28..cf17ae8b 100644 --- a/variants/lilygo_tbeam_1w/platformio.ini +++ b/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 diff --git a/variants/lilygo_tbeam_1w/target.cpp b/variants/lilygo_tbeam_1w/target.cpp index 53c6f86a..5087dee8 100644 --- a/variants/lilygo_tbeam_1w/target.cpp +++ b/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 diff --git a/variants/lilygo_tbeam_1w/target.h b/variants/lilygo_tbeam_1w/target.h index 6de76133..a521332f 100644 --- a/variants/lilygo_tbeam_1w/target.h +++ b/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 diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini index d3bc7c99..9fb4805f 100644 --- a/variants/lilygo_tbeam_SX1262/platformio.ini +++ b/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 diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index 2ffa8974..9d5d3e4a 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/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 diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h index 684e6afc..691c01d4 100644 --- a/variants/lilygo_tbeam_SX1262/target.h +++ b/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 diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini index ffee37a9..1ac622db 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini +++ b/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 diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp index af9d3f0d..553a44c7 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp +++ b/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 diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.h b/variants/lilygo_tbeam_supreme_SX1262/target.h index 90aad7aa..901c0715 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.h +++ b/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 \ No newline at end of file diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini index a8408afa..807663f8 100644 --- a/variants/lilygo_tdeck/platformio.ini +++ b/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 diff --git a/variants/lilygo_tdeck/target.cpp b/variants/lilygo_tdeck/target.cpp index 508a9e92..32586a16 100644 --- a/variants/lilygo_tdeck/target.cpp +++ b/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 \ No newline at end of file diff --git a/variants/lilygo_tdeck/target.h b/variants/lilygo_tdeck/target.h index 19292bea..75247734 100644 --- a/variants/lilygo_tdeck/target.h +++ b/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 \ No newline at end of file diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini index c963f29d..e2172b1d 100644 --- a/variants/lilygo_techo/platformio.ini +++ b/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 diff --git a/variants/lilygo_techo/target.cpp b/variants/lilygo_techo/target.cpp index c8e54f00..1dfa9164 100644 --- a/variants/lilygo_techo/target.cpp +++ b/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 diff --git a/variants/lilygo_techo/target.h b/variants/lilygo_techo/target.h index e942cb07..12b67c1c 100644 --- a/variants/lilygo_techo/target.h +++ b/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 diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini index 463155c0..0ba6a197 100644 --- a/variants/lilygo_techo_lite/platformio.ini +++ b/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 diff --git a/variants/lilygo_techo_lite/target.cpp b/variants/lilygo_techo_lite/target.cpp index d35681b6..dbb61b19 100644 --- a/variants/lilygo_techo_lite/target.cpp +++ b/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 diff --git a/variants/lilygo_techo_lite/target.h b/variants/lilygo_techo_lite/target.h index e942cb07..12b67c1c 100644 --- a/variants/lilygo_techo_lite/target.h +++ b/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 diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini index 89e63352..b29cd036 100644 --- a/variants/lilygo_tlora_c6/platformio.ini +++ b/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 diff --git a/variants/lilygo_tlora_c6/target.cpp b/variants/lilygo_tlora_c6/target.cpp index 0d07aeaa..a73c1c99 100644 --- a/variants/lilygo_tlora_c6/target.cpp +++ b/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 diff --git a/variants/lilygo_tlora_c6/target.h b/variants/lilygo_tlora_c6/target.h index fdb62a31..0946b58b 100644 --- a/variants/lilygo_tlora_c6/target.h +++ b/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 diff --git a/variants/m5stack_unit_c6l/UnitC6LBoard.cpp b/variants/m5stack_unit_c6l/UnitC6LBoard.cpp index 27c294fa..08c76660 100644 --- a/variants/m5stack_unit_c6l/UnitC6LBoard.cpp +++ b/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 diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini index 84c6562a..1dd6749a 100644 --- a/variants/m5stack_unit_c6l/platformio.ini +++ b/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 diff --git a/variants/m5stack_unit_c6l/target.h b/variants/m5stack_unit_c6l/target.h index 472ee6a7..665850dd 100644 --- a/variants/m5stack_unit_c6l/target.h +++ b/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 \ No newline at end of file +mesh::LocalIdentity radio_new_identity(); \ No newline at end of file diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini index 4750389c..015c2ca4 100644 --- a/variants/mesh_pocket/platformio.ini +++ b/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 diff --git a/variants/mesh_pocket/target.cpp b/variants/mesh_pocket/target.cpp index 63c4e0b2..3ca71463 100644 --- a/variants/mesh_pocket/target.cpp +++ b/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 diff --git a/variants/mesh_pocket/target.h b/variants/mesh_pocket/target.h index 84464cc1..233721fe 100644 --- a/variants/mesh_pocket/target.h +++ b/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 diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index ea1894cd..18b64ac3 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -41,7 +41,6 @@ build_src_filter = ${Meshadventurer.build_src_filter} + 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} + 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} + 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} + 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 diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp index e95c831d..9153fc93 100644 --- a/variants/meshadventurer/target.cpp +++ b/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) { diff --git a/variants/meshadventurer/target.h b/variants/meshadventurer/target.h index 0448f768..f91d2fa7 100644 --- a/variants/meshadventurer/target.h +++ b/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 diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini index 0d5de517..14e5c60d 100644 --- a/variants/meshtiny/platformio.ini +++ b/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 diff --git a/variants/meshtiny/target.cpp b/variants/meshtiny/target.cpp index 11d1884c..953c8b3f 100644 --- a/variants/meshtiny/target.cpp +++ b/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 \ No newline at end of file +} \ No newline at end of file diff --git a/variants/meshtiny/target.h b/variants/meshtiny/target.h index 4df051cb..6dadd566 100644 --- a/variants/meshtiny/target.h +++ b/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 diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index 8dc91388..116a1f25 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/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 diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 2ebf7aef..804d270e 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/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 \ No newline at end of file +} \ No newline at end of file diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index 6d34af5a..dcd63791 100644 --- a/variants/nano_g2_ultra/target.h +++ b/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 diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index 8a4e63ca..0d3d4652 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/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 diff --git a/variants/nibble_screen_connect/target.cpp b/variants/nibble_screen_connect/target.cpp index 7d2d117b..5aadd8b2 100644 --- a/variants/nibble_screen_connect/target.cpp +++ b/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); +} diff --git a/variants/nibble_screen_connect/target.h b/variants/nibble_screen_connect/target.h index 0555c012..020cd434 100644 --- a/variants/nibble_screen_connect/target.h +++ b/variants/nibble_screen_connect/target.h @@ -26,10 +26,5 @@ 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(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 +mesh::LocalIdentity radio_new_identity(); diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index 317537a9..15bb5ce6 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -4,7 +4,6 @@ board = promicro_nrf52840 build_flags = ${nrf52_base.build_flags} -I variants/promicro -D PROMICRO - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp index ef4dfc3c..2db33465 100644 --- a/variants/promicro/target.cpp +++ b/variants/promicro/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 diff --git a/variants/promicro/target.h b/variants/promicro/target.h index 5104dcb7..4b3de981 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/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 diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini index d5537627..950b46ef 100644 --- a/variants/rak11310/platformio.ini +++ b/variants/rak11310/platformio.ini @@ -10,7 +10,6 @@ build_flags = ${rp2040_base.build_flags} -D RAK_11310 -D ARDUINO_RAKWIRELESS_RAK11300=1 -D SX126X_CURRENT_LIMIT=140 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=29 diff --git a/variants/rak11310/target.cpp b/variants/rak11310/target.cpp index 0690a1da..3441a316 100644 --- a/variants/rak11310/target.cpp +++ b/variants/rak11310/target.cpp @@ -36,13 +36,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 \ No newline at end of file +} \ No newline at end of file diff --git a/variants/rak11310/target.h b/variants/rak11310/target.h index 5cbba604..c21274b9 100644 --- a/variants/rak11310/target.h +++ b/variants/rak11310/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 diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini index b4165bb2..d030e749 100644 --- a/variants/rak3112/platformio.ini +++ b/variants/rak3112/platformio.ini @@ -15,7 +15,6 @@ build_flags = -D P_LORA_SCLK=5 -D P_LORA_MISO=3 -D P_LORA_MOSI=6 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/rak3112/target.cpp b/variants/rak3112/target.cpp index 34708484..7a7862ee 100644 --- a/variants/rak3112/target.cpp +++ b/variants/rak3112/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 diff --git a/variants/rak3112/target.h b/variants/rak3112/target.h index 1a6ded39..72f13f32 100644 --- a/variants/rak3112/target.h +++ b/variants/rak3112/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 diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini index 646933ca..ecea0317 100644 --- a/variants/rak3401/platformio.ini +++ b/variants/rak3401/platformio.ini @@ -6,7 +6,6 @@ build_flags = ${nrf52_base.build_flags} ${sensor_base.build_flags} -I variants/rak3401 -D RAK_3401 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/rak3401/target.cpp b/variants/rak3401/target.cpp index 0d08718e..7f077d65 100644 --- a/variants/rak3401/target.cpp +++ b/variants/rak3401/target.cpp @@ -57,12 +57,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 diff --git a/variants/rak3401/target.h b/variants/rak3401/target.h index 0b3f1f49..215be38c 100644 --- a/variants/rak3401/target.h +++ b/variants/rak3401/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 diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index 842a1ad1..737ef565 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -14,7 +14,6 @@ build_flags = ${nrf52_base.build_flags} -D PIN_GPS_RX=PIN_SERIAL1_TX -D PIN_GPS_EN=-1 -D PIN_OLED_RESET=-1 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/rak4631/target.cpp b/variants/rak4631/target.cpp index 1db72b79..5666d9ec 100644 --- a/variants/rak4631/target.cpp +++ b/variants/rak4631/target.cpp @@ -57,12 +57,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 diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h index 6d7c28c4..51337c53 100644 --- a/variants/rak4631/target.h +++ b/variants/rak4631/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 diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini index 513f76c7..081cb0d0 100644 --- a/variants/rak_wismesh_tag/platformio.ini +++ b/variants/rak_wismesh_tag/platformio.ini @@ -16,7 +16,6 @@ build_flags = ${nrf52_base.build_flags} -D P_LORA_SCLK=PIN_SPI_SCK -D P_LORA_MISO=PIN_SPI_MISO -D P_LORA_MOSI=PIN_SPI_MOSI - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D DISPLAY_CLASS=NullDisplayDriver diff --git a/variants/rak_wismesh_tag/target.cpp b/variants/rak_wismesh_tag/target.cpp index bbbaf29c..d6d0e127 100644 --- a/variants/rak_wismesh_tag/target.cpp +++ b/variants/rak_wismesh_tag/target.cpp @@ -53,12 +53,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 diff --git a/variants/rak_wismesh_tag/target.h b/variants/rak_wismesh_tag/target.h index 15e38fbe..bc5a4921 100644 --- a/variants/rak_wismesh_tag/target.h +++ b/variants/rak_wismesh_tag/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 diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini index 2d261b25..ec5cdb83 100644 --- a/variants/rpi_picow/platformio.ini +++ b/variants/rpi_picow/platformio.ini @@ -20,7 +20,6 @@ build_flags = ${rp2040_base.build_flags} -D SX126X_CURRENT_LIMIT=130 -D SX126X_RX_BOOSTED_GAIN=1 -D LORA_TX_POWER=22 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper build_src_filter = ${rp2040_base.build_src_filter} diff --git a/variants/rpi_picow/target.cpp b/variants/rpi_picow/target.cpp index 93191e0f..1166dc46 100644 --- a/variants/rpi_picow/target.cpp +++ b/variants/rpi_picow/target.cpp @@ -38,12 +38,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 diff --git a/variants/rpi_picow/target.h b/variants/rpi_picow/target.h index 48a36362..255d3067 100644 --- a/variants/rpi_picow/target.h +++ b/variants/rpi_picow/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 diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini index fee10497..d4fb7b44 100644 --- a/variants/sensecap_solar/platformio.ini +++ b/variants/sensecap_solar/platformio.ini @@ -10,7 +10,6 @@ build_flags = ${nrf52_base.build_flags} -I src/helpers/nrf52 -UENV_INCLUDE_GPS -D NRF52_PLATFORM=1 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_TX_LED=12 diff --git a/variants/sensecap_solar/target.cpp b/variants/sensecap_solar/target.cpp index 8e04d5ad..5ebbfaf5 100644 --- a/variants/sensecap_solar/target.cpp +++ b/variants/sensecap_solar/target.cpp @@ -38,12 +38,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 diff --git a/variants/sensecap_solar/target.h b/variants/sensecap_solar/target.h index 0f03441b..243c4440 100644 --- a/variants/sensecap_solar/target.h +++ b/variants/sensecap_solar/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 diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index b8fc8786..91ef5f7a 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -7,7 +7,6 @@ build_flags = -I variants/station_g2 -I src/helpers/ui -D STATION_G2 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=48 diff --git a/variants/station_g2/target.cpp b/variants/station_g2/target.cpp index a748dfa0..40fa8005 100644 --- a/variants/station_g2/target.cpp +++ b/variants/station_g2/target.cpp @@ -60,12 +60,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 diff --git a/variants/station_g2/target.h b/variants/station_g2/target.h index 563ff55f..9a361025 100644 --- a/variants/station_g2/target.h +++ b/variants/station_g2/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 diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini index 4f8c2ea6..183a5684 100644 --- a/variants/tenstar_c3/platformio.ini +++ b/variants/tenstar_c3/platformio.ini @@ -29,7 +29,6 @@ build_src_filter = ${Tenstar_esp32_C3.build_src_filter} +<../examples/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D SX126X_RX_BOOSTED_GAIN=1 @@ -78,7 +77,6 @@ build_src_filter = ${Tenstar_esp32_C3.build_src_filter} +<../examples/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D SX126X_RX_BOOSTED_GAIN=1 @@ -102,7 +100,6 @@ build_src_filter = ${Tenstar_esp32_C3.build_src_filter} +<../examples/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} - -D USE_SX1268 -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 @@ -149,7 +146,6 @@ build_src_filter = ${Tenstar_esp32_C3.build_src_filter} +<../examples/simple_repeater/*.cpp> build_flags = ${Tenstar_esp32_C3.build_flags} - -D USE_SX1268 -D RADIO_CLASS=CustomSX1268 -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 diff --git a/variants/tenstar_c3/target.cpp b/variants/tenstar_c3/target.cpp index da25fec7..8a0f3f07 100644 --- a/variants/tenstar_c3/target.cpp +++ b/variants/tenstar_c3/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 diff --git a/variants/tenstar_c3/target.h b/variants/tenstar_c3/target.h index ce85a478..b228b04e 100644 --- a/variants/tenstar_c3/target.h +++ b/variants/tenstar_c3/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 diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index b246110e..397bf8e3 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags} -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52 -I variants/thinknode_m1 -D THINKNODE_M1=1 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=20 diff --git a/variants/thinknode_m1/target.cpp b/variants/thinknode_m1/target.cpp index 4aad738e..b2e16283 100644 --- a/variants/thinknode_m1/target.cpp +++ b/variants/thinknode_m1/target.cpp @@ -151,12 +151,3 @@ bool ThinkNodeM1SensorManager::setSettingValue(const char* name, const char* val 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 diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h index ab6901f6..3882202b 100644 --- a/variants/thinknode_m1/target.h +++ b/variants/thinknode_m1/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 diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index a765d9c7..b2ebca73 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -25,7 +25,6 @@ build_flags = ${esp32_base.build_flags} -D SX126X_DIO3_TCXO_VOLTAGE=3.3 -D SX126X_CURRENT_LIMIT=140 -D DISPLAY_CLASS=SH1106Display - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/thinknode_m2/target.cpp b/variants/thinknode_m2/target.cpp index 8ef44872..52afba9c 100644 --- a/variants/thinknode_m2/target.cpp +++ b/variants/thinknode_m2/target.cpp @@ -55,13 +55,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 diff --git a/variants/thinknode_m2/target.h b/variants/thinknode_m2/target.h index 00009aa7..ddaaeff7 100644 --- a/variants/thinknode_m2/target.h +++ b/variants/thinknode_m2/target.h @@ -29,8 +29,4 @@ 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 diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini index 0c64bcef..fb2ba3ac 100644 --- a/variants/thinknode_m5/platformio.ini +++ b/variants/thinknode_m5/platformio.ini @@ -32,7 +32,6 @@ build_flags = ${esp32_base.build_flags} -D SX126X_DIO2_AS_RF_SWITCH=true -D SX126X_DIO3_TCXO_VOLTAGE=3.3 -D SX126X_CURRENT_LIMIT=140 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/thinknode_m5/target.cpp b/variants/thinknode_m5/target.cpp index a42dc89c..f5f3ecd3 100644 --- a/variants/thinknode_m5/target.cpp +++ b/variants/thinknode_m5/target.cpp @@ -62,13 +62,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 diff --git a/variants/thinknode_m5/target.h b/variants/thinknode_m5/target.h index 5800417e..d10760e2 100644 --- a/variants/thinknode_m5/target.h +++ b/variants/thinknode_m5/target.h @@ -32,9 +32,5 @@ 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 \ No newline at end of file diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini index 2bd34f31..db22073c 100644 --- a/variants/thinknode_m6/platformio.ini +++ b/variants/thinknode_m6/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/thinknode_m6 -D THINKNODE_M6=1 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=38 diff --git a/variants/thinknode_m6/target.cpp b/variants/thinknode_m6/target.cpp index 11111946..b690df18 100644 --- a/variants/thinknode_m6/target.cpp +++ b/variants/thinknode_m6/target.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 diff --git a/variants/thinknode_m6/target.h b/variants/thinknode_m6/target.h index 31b0b8cc..221e0a7c 100644 --- a/variants/thinknode_m6/target.h +++ b/variants/thinknode_m6/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 diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini index 1f7fb02f..78a5e3e7 100644 --- a/variants/waveshare_rp2040_lora/platformio.ini +++ b/variants/waveshare_rp2040_lora/platformio.ini @@ -8,7 +8,6 @@ board_build.filesystem_size = 0.5m build_flags = ${rp2040_base.build_flags} -I variants/waveshare_rp2040_lora -D SX126X_CURRENT_LIMIT=140 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=16 diff --git a/variants/waveshare_rp2040_lora/target.cpp b/variants/waveshare_rp2040_lora/target.cpp index ff9ac878..459bf82c 100644 --- a/variants/waveshare_rp2040_lora/target.cpp +++ b/variants/waveshare_rp2040_lora/target.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 diff --git a/variants/waveshare_rp2040_lora/target.h b/variants/waveshare_rp2040_lora/target.h index 15b45cac..4590f0d1 100644 --- a/variants/waveshare_rp2040_lora/target.h +++ b/variants/waveshare_rp2040_lora/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 diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index 42c83477..deb85f5e 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -9,7 +9,6 @@ build_flags = ${nrf52_base.build_flags} -I variants/wio-tracker-l1 -D WIO_TRACKER_L1 -D WIO_TRACKER_L1_EINK - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 6c1e8f63..da760b51 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags} -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52 -I variants/wio-tracker-l1 -D WIO_TRACKER_L1 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/wio-tracker-l1/target.cpp b/variants/wio-tracker-l1/target.cpp index 96d8ebd9..896ead26 100644 --- a/variants/wio-tracker-l1/target.cpp +++ b/variants/wio-tracker-l1/target.cpp @@ -53,12 +53,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 diff --git a/variants/wio-tracker-l1/target.h b/variants/wio-tracker-l1/target.h index 75fcbe48..72766e77 100644 --- a/variants/wio-tracker-l1/target.h +++ b/variants/wio-tracker-l1/target.h @@ -36,7 +36,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 diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini index 95142269..76b72174 100644 --- a/variants/xiao_c3/platformio.ini +++ b/variants/xiao_c3/platformio.ini @@ -15,7 +15,6 @@ build_flags = -D P_LORA_BUSY=D3 -D PIN_BOARD_SDA=D6 -D PIN_BOARD_SCL=D7 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D SX126X_RX_BOOSTED_GAIN=1 diff --git a/variants/xiao_c3/target.cpp b/variants/xiao_c3/target.cpp index 12c257c0..ca7fb6bf 100644 --- a/variants/xiao_c3/target.cpp +++ b/variants/xiao_c3/target.cpp @@ -55,12 +55,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 diff --git a/variants/xiao_c3/target.h b/variants/xiao_c3/target.h index 4fa0be27..54a389f0 100644 --- a/variants/xiao_c3/target.h +++ b/variants/xiao_c3/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 diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini index 5d9928c5..8f02dc87 100644 --- a/variants/xiao_c6/platformio.ini +++ b/variants/xiao_c6/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 diff --git a/variants/xiao_c6/target.h b/variants/xiao_c6/target.h index 1095a9f4..4ec06ee1 100644 --- a/variants/xiao_c6/target.h +++ b/variants/xiao_c6/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 diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini index b9a860aa..fe2f546e 100644 --- a/variants/xiao_nrf52/platformio.ini +++ b/variants/xiao_nrf52/platformio.ini @@ -11,7 +11,6 @@ build_flags = ${nrf52_base.build_flags} -D NRF52_PLATFORM -D NRF52_POWER_MANAGEMENT -D XIAO_NRF52 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D LORA_TX_POWER=22 diff --git a/variants/xiao_nrf52/target.cpp b/variants/xiao_nrf52/target.cpp index 8d30fde9..4d7d5912 100644 --- a/variants/xiao_nrf52/target.cpp +++ b/variants/xiao_nrf52/target.cpp @@ -41,13 +41,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 \ No newline at end of file +} \ No newline at end of file diff --git a/variants/xiao_nrf52/target.h b/variants/xiao_nrf52/target.h index c78b8682..956e8362 100644 --- a/variants/xiao_nrf52/target.h +++ b/variants/xiao_nrf52/target.h @@ -25,7 +25,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 diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini index e5d652c3..2b3e7442 100644 --- a/variants/xiao_rp2040/platformio.ini +++ b/variants/xiao_rp2040/platformio.ini @@ -5,7 +5,6 @@ board_build.filesystem_size = 0.5m build_flags = ${rp2040_base.build_flags} -I variants/xiao_rp2040 -D SX126X_CURRENT_LIMIT=140 - -D USE_SX1262 -D RADIO_CLASS=CustomSX1262 -D WRAPPER_CLASS=CustomSX1262Wrapper -D P_LORA_DIO_1=27 ; D1 diff --git a/variants/xiao_rp2040/target.cpp b/variants/xiao_rp2040/target.cpp index 50e2f23a..b3756480 100644 --- a/variants/xiao_rp2040/target.cpp +++ b/variants/xiao_rp2040/target.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 diff --git a/variants/xiao_rp2040/target.h b/variants/xiao_rp2040/target.h index ab419908..94629b7c 100644 --- a/variants/xiao_rp2040/target.h +++ b/variants/xiao_rp2040/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 diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 13d40679..22bb4090 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -24,7 +24,6 @@ build_flags = ${esp32_base.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 diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp index 3ef12b2c..42356b0e 100644 --- a/variants/xiao_s3_wio/target.cpp +++ b/variants/xiao_s3_wio/target.cpp @@ -55,12 +55,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 diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h index 14e39fef..d8502863 100644 --- a/variants/xiao_s3_wio/target.h +++ b/variants/xiao_s3_wio/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