forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[LoRaWAN] Use getModem instead of caching modulation

Browse source
This commit is contained in:
jgromes 2024-10-26 08:46:52 +01:00
parent 6dac841b69
commit e40fc3830b
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/protocols/LoRaWAN/LoRaWAN.cpp
View file

@ -2768,14 +2768,19 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
return(state); return(state);
} }
// get the currently configured modem from the radio
ModemType_t modem;
state = this->phyLayer->getModem(&modem);
RADIOLIB_ASSERT(state);
// set modem-dependent functions // set modem-dependent functions
switch(this->band->dataRates[chnl->dr] & RADIOLIB_LORAWAN_DATA_RATE_MODEM) { switch(this->band->dataRates[chnl->dr] & RADIOLIB_LORAWAN_DATA_RATE_MODEM) {
case(RADIOLIB_LORAWAN_DATA_RATE_LORA): case(RADIOLIB_LORAWAN_DATA_RATE_LORA):
if(this->modulation != RADIOLIB_LORAWAN_MODULATION_LORA) { if(modem != ModemType_t::LoRa) {
state = this->phyLayer->setModem(ModemType_t::LoRa); state = this->phyLayer->setModem(ModemType_t::LoRa);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
} }
this->modulation = RADIOLIB_LORAWAN_MODULATION_LORA; modem = ModemType_t::LoRa;
// downlink messages are sent with inverted IQ // downlink messages are sent with inverted IQ
if(dir == RADIOLIB_LORAWAN_DOWNLINK) { if(dir == RADIOLIB_LORAWAN_DOWNLINK) {
state = this->phyLayer->invertIQ(true); state = this->phyLayer->invertIQ(true);
@ -2786,11 +2791,11 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
break; break;
case(RADIOLIB_LORAWAN_DATA_RATE_FSK): case(RADIOLIB_LORAWAN_DATA_RATE_FSK):
if(this->modulation != RADIOLIB_LORAWAN_MODULATION_GFSK) { if(modem != ModemType_t::FSK) {
state = this->phyLayer->setModem(ModemType_t::FSK); state = this->phyLayer->setModem(ModemType_t::FSK);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
} }
this->modulation = RADIOLIB_LORAWAN_MODULATION_GFSK; modem = ModemType_t::FSK;
state = this->phyLayer->setDataShaping(RADIOLIB_SHAPING_1_0); state = this->phyLayer->setDataShaping(RADIOLIB_SHAPING_1_0);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
state = this->phyLayer->setEncoding(RADIOLIB_ENCODING_WHITENING); state = this->phyLayer->setEncoding(RADIOLIB_ENCODING_WHITENING);
@ -2798,11 +2803,11 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
break; break;
case(RADIOLIB_LORAWAN_DATA_RATE_LR_FHSS): case(RADIOLIB_LORAWAN_DATA_RATE_LR_FHSS):
if(this->modulation != RADIOLIB_LORAWAN_DATA_RATE_LR_FHSS) { if(modem != ModemType_t::LRFHSS) {
state = this->phyLayer->setModem(ModemType_t::LRFHSS); state = this->phyLayer->setModem(ModemType_t::LRFHSS);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
} }
this->modulation = RADIOLIB_LORAWAN_MODULATION_LR_FHSS; modem = ModemType_t::LRFHSS;
break; break;
default: default:
@ -2826,40 +2831,37 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
state = this->phyLayer->setDataRate(dr); state = this->phyLayer->setDataRate(dr);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
if(this->modulation == RADIOLIB_LORAWAN_MODULATION_GFSK) {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("FSK: BR = %4.1f, FD = %4.1f kHz",
dr.fsk.bitRate, dr.fsk.freqDev);
}
if(this->modulation == RADIOLIB_LORAWAN_MODULATION_LORA) {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("LoRa: SF = %d, BW = %5.1f kHz, CR = 4/%d, IQ: %c",
dr.lora.spreadingFactor, dr.lora.bandwidth, dr.lora.codingRate, dir ? 'D' : 'U');
}
// this only needs to be done once-ish // this only needs to be done once-ish
uint8_t syncWord[4] = { 0 }; uint8_t syncWord[4] = { 0 };
uint8_t syncWordLen = 0; uint8_t syncWordLen = 0;
size_t preLen = 0; size_t preLen = 0;
switch(this->modulation) { switch(modem) {
case(RADIOLIB_LORAWAN_MODULATION_GFSK): { case(ModemType_t::FSK): {
preLen = 8*RADIOLIB_LORAWAN_GFSK_PREAMBLE_LEN; preLen = 8*RADIOLIB_LORAWAN_GFSK_PREAMBLE_LEN;
syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 16); syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 16);
syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 8); syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 8);
syncWord[2] = (uint8_t)RADIOLIB_LORAWAN_GFSK_SYNC_WORD; syncWord[2] = (uint8_t)RADIOLIB_LORAWAN_GFSK_SYNC_WORD;
syncWordLen = 3; syncWordLen = 3;
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("FSK: BR = %4.1f, FD = %4.1f kHz",
dr.fsk.bitRate, dr.fsk.freqDev);
} break; } break;
case(RADIOLIB_LORAWAN_MODULATION_LORA): { case(ModemType_t::LoRa): {
preLen = RADIOLIB_LORAWAN_LORA_PREAMBLE_LEN; preLen = RADIOLIB_LORAWAN_LORA_PREAMBLE_LEN;
syncWord[0] = RADIOLIB_LORAWAN_LORA_SYNC_WORD; syncWord[0] = RADIOLIB_LORAWAN_LORA_SYNC_WORD;
syncWordLen = 1; syncWordLen = 1;
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("LoRa: SF = %d, BW = %5.1f kHz, CR = 4/%d, IQ: %c",
dr.lora.spreadingFactor, dr.lora.bandwidth, dr.lora.codingRate, dir ? 'D' : 'U');
} break; } break;
case(RADIOLIB_LORAWAN_MODULATION_LR_FHSS): { case(ModemType_t::LRFHSS): {
syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 24); syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 24);
syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 16); syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 16);
syncWord[2] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 8); syncWord[2] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 8);
syncWord[3] = (uint8_t)RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD; syncWord[3] = (uint8_t)RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD;
syncWordLen = 4; syncWordLen = 4;
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("LR-FHSS: BW = 0x%02x, CR = 0x%02x kHz, grid = %c",
dr.lrfhss.bw, dr.lrfhss.cr, dr.lrFhss.narrowGrid ? 'N' : 'W');
} break; } break;
default: default:
@ -2873,7 +2875,7 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
if(pre) { if(pre) {
preLen = pre; preLen = pre;
} }
if(this->modulation != RADIOLIB_LORAWAN_MODULATION_LR_FHSS) { if(modem != ModemType_t::LRFHSS) {
state = this->phyLayer->setPreambleLength(preLen); state = this->phyLayer->setPreambleLength(preLen);
} }
return(state); return(state);

8
src/protocols/LoRaWAN/LoRaWAN.h
View file

@ -15,11 +15,6 @@
#define RADIOLIB_LORAWAN_CLASS_B (0x0B) #define RADIOLIB_LORAWAN_CLASS_B (0x0B)
#define RADIOLIB_LORAWAN_CLASS_C (0x0C) #define RADIOLIB_LORAWAN_CLASS_C (0x0C)
// modulation type
#define RADIOLIB_LORAWAN_MODULATION_LORA (0)
#define RADIOLIB_LORAWAN_MODULATION_GFSK (1)
#define RADIOLIB_LORAWAN_MODULATION_LR_FHSS (2)
// preamble format // preamble format
#define RADIOLIB_LORAWAN_LORA_SYNC_WORD (0x34) #define RADIOLIB_LORAWAN_LORA_SYNC_WORD (0x34)
#define RADIOLIB_LORAWAN_LORA_PREAMBLE_LEN (8) #define RADIOLIB_LORAWAN_LORA_PREAMBLE_LEN (8)
@ -916,9 +911,6 @@ class LoRaWANNode {
uint32_t confFCntDown = RADIOLIB_LORAWAN_FCNT_NONE; uint32_t confFCntDown = RADIOLIB_LORAWAN_FCNT_NONE;
uint32_t adrFCnt = 0; uint32_t adrFCnt = 0;
// modulation of the currently configured channel
uint8_t modulation = RADIOLIB_LORAWAN_MODULATION_LORA;
// ADR is enabled by default // ADR is enabled by default
bool adrEnabled = true; bool adrEnabled = true;