Remove product specific variables and target flags

Since variant detection is using ant_switch pin, it is now only used if that pin
has been connected. Otherwise generic variant code is used.

Author: Kimmo Vaisanen

SX1272/SX1272_LoRaRadio.cpp

@@ -61,7 +61,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 
 enum RadioVariant {
-    SX1272MB2XAS = 0,
+    SX1272UNDEFINED = 0,
+    SX1272MB2XAS,
     SX1272MB1DCS
 };
 
@@ -1369,15 +1370,13 @@ void SX1272_LoRaRadio::default_antenna_switch_ctrls()
  */
 uint8_t SX1272_LoRaRadio::get_pa_conf_reg()
 {
-
-#if defined(TARGET_MTS_MDOT_F411RE) || defined(TARGET_XDOT_L151CC) || defined(TARGET_MTB_MTS_XDOT)
-    return RF_PACONFIG_PASELECT_PABOOST;
-#endif
-    if (radio_variant == SX1272MB1DCS) {
+    if (radio_variant == SX1272UNDEFINED) {
+        return RF_PACONFIG_PASELECT_PABOOST;
+    } else if (radio_variant == SX1272MB1DCS) {
         return RF_PACONFIG_PASELECT_PABOOST;
+    } else {
+        return RF_PACONFIG_PASELECT_RFO;
     }
-
-    return RF_PACONFIG_PASELECT_RFO;
 }
 
 /**
@@ -1488,15 +1487,19 @@ void SX1272_LoRaRadio::setup_registers()
  */
 void SX1272_LoRaRadio::set_sx1272_variant_type()
 {
-    _ant_switch.input();
-    wait_ms(1);
-    if (_ant_switch == 1) {
-        radio_variant = SX1272MB1DCS;
+    if (_rf_ctrls.ant_switch != NC){
+        _ant_switch.input();
+        wait_ms(1);
+        if (_ant_switch == 1) {
+            radio_variant = SX1272MB1DCS;
+        } else {
+            radio_variant = SX1272MB2XAS;
+        }
+        _ant_switch.output();
+        wait_ms(1);
     } else {
-        radio_variant = SX1272MB2XAS;
+        radio_variant = SX1272UNDEFINED;
     }
-    _ant_switch.output();
-    wait_ms(1);
 }
 
 /**

SX1276/SX1276_LoRaRadio.cpp

@@ -146,7 +146,8 @@ static const fsk_bw_t fsk_bandwidths[] =
 static const radio_registers_t radio_reg_init[] = RADIO_INIT_REGISTERS_VALUE;
 
 enum RadioVariant {
-    SX1276MB1LAS = 0,
+    SX1276UNDEFINED = 0,
+    SX1276MB1LAS,
     SX1276MB1MAS
 };
 
@@ -206,13 +207,6 @@ SX1276_LoRaRadio::SX1276_LoRaRadio(PinName spi_mosi,
 
     _radio_events = NULL;
 
-    // Detect Murata based on pin configuration
-    if (pwr_amp_ctl != NC && txctl != NC && rxctl != NC && tcxo != NC) {
-        is_murata = true;
-    } else {
-        is_murata = false;
-    }
-
     if (tcxo != NC) {
         _tcxo = 1;
     }
@@ -259,10 +253,8 @@ void SX1276_LoRaRadio::init_radio(radio_events_t *events)
     // Reset the radio transceiver
     radio_reset();
 
-    if (!is_murata) {
-        // Setup radio variant type
-        set_sx1276_variant_type();
-    }
+    // Setup radio variant type
+    set_sx1276_variant_type();
 
     // setup SPI frequency
     // default is 8MHz although, configurable through
@@ -1356,15 +1348,19 @@ void SX1276_LoRaRadio::set_modem(uint8_t modem )
  */
 void SX1276_LoRaRadio::set_sx1276_variant_type()
 {
-    _ant_switch.input();
-    wait_ms(1);
-    if (_ant_switch == 1) {
-        radio_variant = SX1276MB1LAS;
+    if (_rf_ctrls.ant_switch != NC) {
+        _ant_switch.input();
+        wait_ms(1);
+        if (_ant_switch == 1) {
+            radio_variant = SX1276MB1LAS;
+        } else {
+            radio_variant = SX1276MB1MAS;
+        }
+        _ant_switch.output();
+        wait_ms(1);
     } else {
-        radio_variant = SX1276MB1MAS;
+        radio_variant = SX1276UNDEFINED;
     }
-    _ant_switch.output();
-    wait_ms(1);
 }
 
 /**
@@ -1472,19 +1468,17 @@ uint8_t SX1276_LoRaRadio::get_fsk_bw_reg_val(uint32_t bandwidth)
 
 uint8_t SX1276_LoRaRadio::get_pa_conf_reg(uint32_t channel)
 {
-#if TARGET_MTB_ADV_WISE_1510
-    return RF_PACONFIG_PASELECT_PABOOST;
-#else
-    if (channel > RF_MID_BAND_THRESH) {
-        if (radio_variant == SX1276MB1LAS || is_murata) {
+    if (radio_variant == SX1276UNDEFINED) {
+        return RF_PACONFIG_PASELECT_PABOOST;
+    } else if (channel > RF_MID_BAND_THRESH) {
+        if (radio_variant == SX1276MB1LAS) {
             return RF_PACONFIG_PASELECT_PABOOST;
         } else {
             return RF_PACONFIG_PASELECT_RFO;
         }
     } else {
         return RF_PACONFIG_PASELECT_RFO;
     }
-#endif
 }
 
 /**
@@ -1719,17 +1713,15 @@ void SX1276_LoRaRadio::set_antenna_switch(uint8_t mode)
             if (_rf_ctrls.txctl != NC && _rf_ctrls.rxctl != NC) {
                 // module is in transmit mode and tx/rx submodule control
                 // pins are connected
-                if (is_murata)
-                {
+                if (_rf_ctrls.pwr_amp_ctl != NC) {
                     if (read_register(REG_PACONFIG) & RF_PACONFIG_PASELECT_PABOOST) {
                         _pwr_amp_ctl = 1;
                         _txctl = 0;
                     } else {
                         _pwr_amp_ctl = 0;
                         _txctl = 1;
                     }
-                } else
-                {
+                } else {
                     _txctl = 1;
                 }
                 _rxctl = 0;

SX1276/SX1276_LoRaRadio.h

@@ -390,9 +390,6 @@ class SX1276_LoRaRadio: public LoRaRadio {
     // Access protection
     PlatformMutex mutex;
 
-    // Murata board
-    bool is_murata;
-
     // helper functions
     void setup_registers();
     void default_antenna_switch_ctrls();