Enable lr2021 on native

bin/config.d/lora-usb-meshtoad-nicerflora2021f33.yaml

@@ -0,0 +1,31 @@
+Meta:
+  name: meshtoad2021
+  support: community
+  compatible:
+    - usb
+
+Lora:
+  Module: lr2021
+  CS: 0
+  IRQ: 6
+  Reset: 2
+  Busy: 4
+  DIO3_TCXO_VOLTAGE: 1.8
+  # Defaults for LR2021, but can be overridden by user config
+  # LR2021_MAX_POWER: 22
+  # LR2021_MAX_POWER_HF: 22
+  # LR2021_IRQ_DIO_NUM: 9
+  spidev: ch341
+  USB_PID: 0x5512
+  USB_VID: 0x1A86
+  # Optional: Set the serial number for multi-radio support
+  # USB_Serialnum: 13374201
+
+  # NiceRF LoRa2021F33 module
+  rfswitch_table:
+    pins: [DIO5, DIO6, DIO8]
+    MODE_STBY: [LOW, LOW, LOW]
+    MODE_RX: [LOW, LOW, LOW]
+    MODE_TX: [LOW, HIGH, LOW]
+    MODE_RX_HF: [HIGH, LOW, LOW]
+    MODE_TX_HF: [LOW, LOW, HIGH]

src/mesh/InterfacesTemplates.cpp

@@ -25,7 +25,7 @@ template class LR11x0Interface<LR1110>;
 template class LR11x0Interface<LR1120>;
 template class LR11x0Interface<LR1121>;
 #endif
-#if defined(USE_LR2021) && RADIOLIB_EXCLUDE_LR2021 != 1
+#if RADIOLIB_EXCLUDE_LR2021 != 1
 template class LR20x0Interface<LR2021>;
 #endif
 #ifdef ARCH_STM32WL

src/mesh/LR11x0Interface.cpp

@@ -6,13 +6,15 @@
 #include "mesh/NodeDB.h"
 #ifdef LR11X0_DIO_AS_RF_SWITCH
 #include "rfswitch.h"
+#define lr11x0_rfswitch_dio_pins rfswitch_dio_pins
+#define lr11x0_rfswitch_table rfswitch_table
 #elif ARCH_PORTDUINO
 #include "PortduinoGlue.h"
-#define rfswitch_dio_pins portduino_config.rfswitch_dio_pins
-#define rfswitch_table portduino_config.rfswitch_table
+#define lr11x0_rfswitch_dio_pins portduino_config.rfswitch_dio_pins
+#define lr11x0_rfswitch_table portduino_config.rfswitch_table
 #else
-static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
-static const Module::RfSwitchMode_t rfswitch_table[] = {
+static const uint32_t lr11x0_rfswitch_dio_pins[] = {RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+static const Module::RfSwitchMode_t lr11x0_rfswitch_table[] = {
     {LR11x0::MODE_STBY, {}},  {LR11x0::MODE_RX, {}},   {LR11x0::MODE_TX, {}},   {LR11x0::MODE_TX_HP, {}},
     {LR11x0::MODE_TX_HF, {}}, {LR11x0::MODE_GNSS, {}}, {LR11x0::MODE_WIFI, {}}, END_OF_MODE_TABLE,
 };
@@ -146,7 +148,7 @@ template <typename T> bool LR11x0Interface<T>::init()
 #endif
 
     if (dioAsRfSwitch) {
-        lora.setRfSwitchTable(rfswitch_dio_pins, rfswitch_table);
+        lora.setRfSwitchTable(lr11x0_rfswitch_dio_pins, lr11x0_rfswitch_table);
         LOG_DEBUG("Set DIO RF switch");
     }
 

src/mesh/LR2021Interface.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 
-#if defined(USE_LR2021) && RADIOLIB_EXCLUDE_LR2021 != 1
+#if RADIOLIB_EXCLUDE_LR2021 != 1
 
 #include "LR2021Interface.h"
 #include "error.h"

src/mesh/LR20x0Interface.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 
-#if defined(USE_LR2021) && RADIOLIB_EXCLUDE_LR2021 != 1
+#if RADIOLIB_EXCLUDE_LR2021 != 1
 #include "LR20x0Interface.h"
 #include "error.h"
 #include "mesh/NodeDB.h"
@@ -12,6 +12,10 @@
 
 #ifdef LR2021_DIO_AS_RF_SWITCH
 #include "rfswitch.h"
+#ifndef LR20X0_RFSWITCH_NATIVE
+#define lr20x0_rfswitch_dio_pins rfswitch_dio_pins
+#define lr20x0_rfswitch_table rfswitch_table
+#endif
 #elif ARCH_PORTDUINO
 #include "PortduinoGlue.h"
 #define lr20x0_rfswitch_dio_pins portduino_config.rfswitch_dio_pins
@@ -80,7 +84,10 @@ template <typename T> bool LR20x0Interface<T>::init()
 
     RadioLibInterface::init();
 
-#ifdef LR2021_IRQ_DIO_NUM
+#if ARCH_PORTDUINO
+    lora.irqDioNum = portduino_config.lr2021_irq_dio_num;
+    LOG_DEBUG("Set irqDioNum %d", lora.irqDioNum);
+#elif defined(LR2021_IRQ_DIO_NUM)
     lora.irqDioNum = LR2021_IRQ_DIO_NUM;
     LOG_DEBUG("Set irqDioNum %d", lora.irqDioNum);
 #elif defined(IRQ_DIO_NUM)

src/mesh/RadioInterface.cpp

@@ -338,6 +338,8 @@ std::unique_ptr<RadioInterface> initLoRa()
             return std::unique_ptr<RadioInterface>(new LR1120Interface(hal, cs, irq, rst, busy));
         case use_lr1121:
             return std::unique_ptr<RadioInterface>(new LR1121Interface(hal, cs, irq, rst, busy));
+        case use_lr2021:
+            return std::unique_ptr<RadioInterface>(new LR2021Interface(hal, cs, irq, rst, busy));
         case use_llcc68:
             return std::unique_ptr<RadioInterface>(new LLCC68Interface(hal, cs, irq, rst, busy));
         case use_simradio:

src/platform/portduino/PortduinoGlue.cpp

@@ -799,9 +799,14 @@ bool loadConfig(const char *configPath)
                 portduino_config.lr1110_max_power = yamlConfig["Lora"]["LR1110_MAX_POWER"].as<int>(22);
             if (yamlConfig["Lora"]["LR1120_MAX_POWER"])
                 portduino_config.lr1120_max_power = yamlConfig["Lora"]["LR1120_MAX_POWER"].as<int>(13);
+            if (yamlConfig["Lora"]["LR2021_MAX_POWER"])
+                portduino_config.lr2021_max_power = yamlConfig["Lora"]["LR2021_MAX_POWER"].as<int>(22);
+            if (yamlConfig["Lora"]["LR2021_MAX_POWER_HF"])
+                portduino_config.lr2021_max_power_hf = yamlConfig["Lora"]["LR2021_MAX_POWER_HF"].as<int>(22);
+            if (yamlConfig["Lora"]["LR2021_IRQ_DIO_NUM"])
+                portduino_config.lr2021_irq_dio_num = yamlConfig["Lora"]["LR2021_IRQ_DIO_NUM"].as<int>(9);
             if (yamlConfig["Lora"]["RF95_MAX_POWER"])
                 portduino_config.rf95_max_power = yamlConfig["Lora"]["RF95_MAX_POWER"].as<int>(20);
-
             if (yamlConfig["Lora"]["TX_GAIN_LORA"]) {
                 YAML::Node tx_gain_node = yamlConfig["Lora"]["TX_GAIN_LORA"];
                 if (tx_gain_node.IsSequence() && tx_gain_node.size() != 0) {

src/platform/portduino/PortduinoGlue.h

@@ -42,6 +42,7 @@ enum lora_module_enum {
     use_lr1110,
     use_lr1120,
     use_lr1121,
+    use_lr2021,
     use_llcc68
 };
 
@@ -71,7 +72,8 @@ extern struct portduino_config_struct {
     // Lora
     std::map<lora_module_enum, std::string> loraModules = {
         {use_simradio, "sim"},  {use_autoconf, "auto"}, {use_rf95, "RF95"},     {use_sx1262, "sx1262"}, {use_sx1268, "sx1268"},
-        {use_sx1280, "sx1280"}, {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"}, {use_lr1121, "lr1121"}, {use_llcc68, "LLCC68"}};
+        {use_sx1280, "sx1280"}, {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"}, {use_lr1121, "lr1121"}, {use_lr2021, "lr2021"},
+        {use_llcc68, "LLCC68"}};
 
     std::map<screen_modules, std::string> screen_names = {{x11, "X11"},         {fb, "FB"},           {st7789, "ST7789"},
                                                           {st7735, "ST7735"},   {st7735s, "ST7735S"}, {st7796, "ST7796"},
@@ -93,6 +95,9 @@ extern struct portduino_config_struct {
     int sx128x_max_power = 13;
     int lr1110_max_power = 22;
     int lr1120_max_power = 13;
+    int lr2021_max_power = 22;
+    int lr2021_max_power_hf = 22;
+    int lr2021_irq_dio_num = 9;
     int rf95_max_power = 20;
     bool dio2_as_rf_switch = false;
     int dio3_tcxo_voltage = 0;

variants/nrf52840/diy/nrf52_promicro_diy_tcxo/rfswitch.h

@@ -1,11 +1,14 @@
-#pragma once
 #include "RadioLib.h"
 
 // Keep LR20x0 naming while RadioLib exposes LR2021 symbols.
 #ifndef LR20x0
 #define LR20x0 LR2021
 #endif
 
+
+
+#ifndef RFSWITCH_NRF52TCXO_LR11X0_DEFINED
+#define RFSWITCH_NRF52TCXO_LR11X0_DEFINED
 // This is rewritten to match the requirements of the E80-900M2213S
 // The E80 does not conform to the reference Semtech switches(!) and therefore needs a custom matrix.
 // See footnote #3 in "https://www.cdebyte.com/products/E80-900M2213S/2#Pin"
@@ -30,13 +33,19 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
     END_OF_MODE_TABLE,
     // clang-format on
 };
+#endif
 
 // LR2021 RF switch matrix following the standard Semtech / Seeed T1000-E reference topology.
 // DIO5 -> antenna path select (HIGH = sub-GHz LF)
 // DIO6 -> TX enable / HP PA select
 // DIO7 -> not connected (no GNSS on LR2021)
 // DIO8 -> RF front-end power enable
-
+//
+// LR20X0_RFSWITCH_NATIVE tells LR20x0Interface.cpp that lr20x0_rfswitch_* are defined here
+// directly, so it should not alias rfswitch_dio_pins (which points to the LR11x0 table above).
+#ifndef RFSWITCH_NRF52TCXO_LR20X0_DEFINED
+#define RFSWITCH_NRF52TCXO_LR20X0_DEFINED
+#define LR20X0_RFSWITCH_NATIVE
 static const uint32_t lr20x0_rfswitch_dio_pins[] = {RADIOLIB_LR2021_DIO5, RADIOLIB_LR2021_DIO6, RADIOLIB_LR2021_DIO7,
                                                     RADIOLIB_LR2021_DIO8, RADIOLIB_NC};
 
@@ -51,3 +60,4 @@ static const Module::RfSwitchMode_t lr20x0_rfswitch_table[] = {
     END_OF_MODE_TABLE,
     // clang-format on
 };
+#endif