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

[LoRaWAN] Use setModem

Browse source
This commit is contained in:
jgromes 2024-10-25 20:50:11 +01:00
parent e5d280718c
commit aa53f3f2c2
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2768,10 +2768,13 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
return(state); return(state);
} }
// TODO implement PhysicalLayer::setModem()
// 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) {
state = this->phyLayer->setModem(ModemType_t::LoRa);
RADIOLIB_ASSERT(state);
}
this->modulation = RADIOLIB_LORAWAN_MODULATION_LORA; this->modulation = RADIOLIB_LORAWAN_MODULATION_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) {
@ -2781,16 +2784,27 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir,
} }
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
break; break;
case(RADIOLIB_LORAWAN_DATA_RATE_FSK): case(RADIOLIB_LORAWAN_DATA_RATE_FSK):
if(this->modulation != RADIOLIB_LORAWAN_MODULATION_GFSK) {
state = this->phyLayer->setModem(ModemType_t::FSK);
RADIOLIB_ASSERT(state);
}
this->modulation = RADIOLIB_LORAWAN_MODULATION_GFSK; this->modulation = RADIOLIB_LORAWAN_MODULATION_GFSK;
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);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
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) {
state = this->phyLayer->setModem(ModemType_t::LRFHSS);
RADIOLIB_ASSERT(state);
}
this->modulation = RADIOLIB_LORAWAN_MODULATION_LR_FHSS; this->modulation = RADIOLIB_LORAWAN_MODULATION_LR_FHSS;
break; break;
default: default:
return(RADIOLIB_ERR_UNSUPPORTED); return(RADIOLIB_ERR_UNSUPPORTED);
} }