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

[LoRaWAN] Fix persistence of channel mask (fixes #1293)

Browse source
This commit is contained in:
StevenCellist 2024-10-28 13:02:58 +01:00
parent 0156c9004e
commit 412136845f
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2917,10 +2917,9 @@ void LoRaWANNode::getChannelPlanMask(uint64_t* chMaskGrp0123, uint32_t* chMaskGr
*chMaskGrp0123 = 0; *chMaskGrp0123 = 0;
*chMaskGrp45 = 0; *chMaskGrp45 = 0;
uint8_t numCh = this->getAvailableChannels(NULL);
// if there are any channels selected, create the mask from those channels // if there are any channels selected, create the mask from those channels
if(numCh > 0) { // channels are always selected for dynamic bands and/or when a device is active
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_DYNAMIC || this->isActivated()) {
for(int i = 0; i < RADIOLIB_LORAWAN_NUM_AVAILABLE_CHANNELS; i++) { for(int i = 0; i < RADIOLIB_LORAWAN_NUM_AVAILABLE_CHANNELS; i++) {
uint8_t idx = this->channelPlan[RADIOLIB_LORAWAN_UPLINK][i].idx; uint8_t idx = this->channelPlan[RADIOLIB_LORAWAN_UPLINK][i].idx;
if(idx != RADIOLIB_LORAWAN_CHANNEL_INDEX_NONE) { if(idx != RADIOLIB_LORAWAN_CHANNEL_INDEX_NONE) {
@ -2932,12 +2931,6 @@ void LoRaWANNode::getChannelPlanMask(uint64_t* chMaskGrp0123, uint32_t* chMaskGr
} }
} }
return; return;
}
// it should not happen that no channels are set for dynamic band
// but in that case, simply return
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_DYNAMIC) {
return;
} else { // bandType == RADIOLIB_LORAWAN_BAND_FIXED } else { // bandType == RADIOLIB_LORAWAN_BAND_FIXED
// if a subband is set, we can set the channel indices straight from subband // if a subband is set, we can set the channel indices straight from subband