kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Guard LR1121/LR2021 radio configs with #ifdef (#10998)

Browse Source 
Add conditional compilation guards for LR1121 and LR2021 radio chip configurations in rfswitch.h to prevent compilation errors when these radios are not in use. Move USE_LR2021 definition to the radio section in variant.h for consistency with other radio chip definitions.
This commit is contained in:
Iris
2026-07-13 05:50:56 -05:00
committed by GitHub
co-authored by GitHub
parent 77292c8415
commit 5e99139a43
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/rfswitch.h
+4 -2
View File
@@ -13,7 +13,7 @@
// DIO5 -> RFSW0_V1 // DIO5 -> RFSW0_V1
// DIO6 -> RFSW1_V2 // DIO6 -> RFSW1_V2
// DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible. // DIO7 -> not connected on E80 module - note that GNSS and Wifi scanning are not possible.
#ifdef USE_LR1121
static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC, static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7, RADIOLIB_NC,
RADIOLIB_NC}; RADIOLIB_NC};
@@ -30,13 +30,14 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
END_OF_MODE_TABLE, END_OF_MODE_TABLE,
// clang-format on // clang-format on
}; };
#endif
// LR2021 RF switch matrix following the standard Semtech / Seeed T1000-E reference topology. // LR2021 RF switch matrix following the standard Semtech / Seeed T1000-E reference topology.
// DIO5 -> antenna path select (HIGH = sub-GHz LF) // DIO5 -> antenna path select (HIGH = sub-GHz LF)
// DIO6 -> TX enable / HP PA select // DIO6 -> TX enable / HP PA select
// DIO7 -> not connected (no GNSS on LR2021) // DIO7 -> not connected (no GNSS on LR2021)
// DIO8 -> RF front-end power enable // DIO8 -> RF front-end power enable
#ifdef USE_LR2021
static const uint32_t lr20x0_rfswitch_dio_pins[] = {RADIOLIB_LR2021_DIO5, RADIOLIB_LR2021_DIO6, RADIOLIB_LR2021_DIO7, static const uint32_t lr20x0_rfswitch_dio_pins[] = {RADIOLIB_LR2021_DIO5, RADIOLIB_LR2021_DIO6, RADIOLIB_LR2021_DIO7,
RADIOLIB_LR2021_DIO8, RADIOLIB_NC}; RADIOLIB_LR2021_DIO8, RADIOLIB_NC};
@@ -51,3 +52,4 @@ static const Module::RfSwitchMode_t lr20x0_rfswitch_table[] = {
END_OF_MODE_TABLE, END_OF_MODE_TABLE,
// clang-format on // clang-format on
}; };
#endif
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
+3 -2
View File
@@ -121,9 +121,9 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#define USE_RF95 #define USE_RF95
#define USE_SX1268 #define USE_SX1268
#define USE_LR1121 #define USE_LR1121
#define USE_LR2021
// RF95 CONFIG // RF95 CONFIG
#define LORA_DIO0 (0 + 29) // P0.29 BUSY #define LORA_DIO0 (0 + 29) // P0.29 BUSY
#define LORA_DIO1 (0 + 10) // P0.10 IRQ #define LORA_DIO1 (0 + 10) // P0.10 IRQ
#define LORA_RESET (0 + 9) // P0.09 NRST #define LORA_RESET (0 + 9) // P0.09 NRST
@@ -156,7 +156,7 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#endif #endif
// LR2021 // LR2021
#define USE_LR2021 #ifdef USE_LR2021
#define LR2021_IRQ_PIN (0 + 10) // P0.10 IRQ #define LR2021_IRQ_PIN (0 + 10) // P0.10 IRQ
#define LR2021_NRESET_PIN LORA_RESET // P0.09 NRST #define LR2021_NRESET_PIN LORA_RESET // P0.09 NRST
#define LR2021_BUSY_PIN (0 + 29) // P0.29 BUSY #define LR2021_BUSY_PIN (0 + 29) // P0.29 BUSY
@@ -164,6 +164,7 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#define LR2021_DIO3_TCXO_VOLTAGE 1.8 #define LR2021_DIO3_TCXO_VOLTAGE 1.8
#define LR2021_DIO_AS_RF_SWITCH #define LR2021_DIO_AS_RF_SWITCH
#define LR2021_IRQ_DIO_NUM 9 // DIO9 → P0.10 #define LR2021_IRQ_DIO_NUM 9 // DIO9 → P0.10
#endif
// #define SX126X_MAX_POWER 8 set this if using a high-power board! // #define SX126X_MAX_POWER 8 set this if using a high-power board!