fix radio type, update to dev branch. added lr1121 radiolib helper. fixed reset pin and rfswitch table.

This commit is contained in:
lbibass 2026-03-31 10:44:02 -04:00
parent 164abd62e3
commit 996c95bfef
6 changed files with 86 additions and 15 deletions

View file

@ -13,8 +13,8 @@ build_flags = ${nrf52_base.build_flags}
-D PIN_USER_BTN=PIN_BUTTON1
-D USER_BTN_PRESSED=LOW
-D PIN_STATUS_LED=35
-D RADIO_CLASS=CustomLR1110
-D WRAPPER_CLASS=CustomLR1110Wrapper
-D RADIO_CLASS=CustomLR1121
-D WRAPPER_CLASS=CustomLR1121Wrapper
-D LORA_TX_POWER=22
-D RF_SWITCH_TABLE
-D RX_BOOSTED_GAIN=true

View file

@ -25,20 +25,18 @@ EnvironmentSensorManager sensors; // only enable environment sensors. GPS is di
static const uint32_t rfswitch_dios[Module::RFSWITCH_MAX_PINS] = {
RADIOLIB_LR11X0_DIO5,
RADIOLIB_LR11X0_DIO6,
RADIOLIB_LR11X0_DIO7,
RADIOLIB_LR11X0_DIO8,
RADIOLIB_NC
};
static const Module::RfSwitchMode_t rfswitch_table[] = {
// mode DIO5 DIO6 DIO7 DIO8
{ LR11x0::MODE_STBY, {LOW, LOW, LOW, LOW }},
{ LR11x0::MODE_RX, {HIGH, LOW, LOW, HIGH }},
{ LR11x0::MODE_TX, {HIGH, HIGH, LOW, HIGH }},
{ LR11x0::MODE_TX_HP, {LOW, HIGH, LOW, HIGH }},
{ LR11x0::MODE_TX_HF, {LOW, LOW, LOW, LOW }},
{ LR11x0::MODE_GNSS, {LOW, LOW, HIGH, LOW }},
{ LR11x0::MODE_WIFI, {LOW, LOW, LOW, LOW }},
// mode DIO5 DIO6
{ LR11x0::MODE_STBY, {LOW, LOW}},
{ LR11x0::MODE_RX, {HIGH, LOW}},
{ LR11x0::MODE_TX, {LOW, HIGH}},
{ LR11x0::MODE_TX_HP, {LOW, HIGH}},
{ LR11x0::MODE_TX_HF, {LOW, LOW}},
{ LR11x0::MODE_GNSS, {LOW, LOW}},
{ LR11x0::MODE_WIFI, {LOW, LOW}},
END_OF_MODE_TABLE,
};
#endif

View file

@ -4,7 +4,7 @@
#include <RadioLib.h>
#include <helpers/radiolib/RadioLibWrappers.h>
#include "muzi_base_duoBoard.h"
#include <helpers/radiolib/CustomLR1110Wrapper.h>
#include <helpers/radiolib/CustomLR1121Wrapper.h>
#include <helpers/ArduinoHelpers.h>
#include <helpers/SensorManager.h>
#include <helpers/sensors/LocationProvider.h>

View file

@ -107,11 +107,11 @@ static const uint8_t AREF = (PIN_AREF); // not used
#define PIN_BACK_BTN PIN_BUTTON6
////////////////////////////////////////////////////////////////////////////////
// LR1110
// LR1121
#define LORA_DIO_1 (32+8) // P1.08
#define LORA_NSS (PIN_SPI_NSS) // P1.12
#define LORA_RESET (32+12) // P1.12
#define LORA_RESET (32+10) // P1.10
#define LORA_BUSY (32+11) // P1.11
#define LORA_SCLK (PIN_SPI_SCK)
#define LORA_MISO (PIN_SPI_MISO)