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

[LoRaWAN] Fix fixed band CFList processing

Browse source
This commit is contained in:
StevenCellist 2024-01-22 12:32:15 +01:00
parent 6979bff863
commit 4ec10a4749
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1849,13 +1849,11 @@ int16_t LoRaWANNode::processCFList(uint8_t* cfList) {
for(size_t chMaskCntl = 0; chMaskCntl < numChMasks; chMaskCntl++) { for(size_t chMaskCntl = 0; chMaskCntl < numChMasks; chMaskCntl++) {
cmd.len = MacTable[RADIOLIB_LORAWAN_MAC_LINK_ADR].lenDn; cmd.len = MacTable[RADIOLIB_LORAWAN_MAC_LINK_ADR].lenDn;
cmd.payload[3] = chMaskCntl << 4; // NbTrans = 0 -> keep the same cmd.payload[3] = chMaskCntl << 4; // NbTrans = 0 -> keep the same
cmd.repeat = (chMaskCntl + 1);
memcpy(&cmd.payload[1], &cfList[chMaskCntl*2], 2); memcpy(&cmd.payload[1], &cfList[chMaskCntl*2], 2);
(void)execMacCommand(&cmd); (void)execMacCommand(&cmd);
// save the response as a MAC answer, as this signals execMacCommand() to store the masks contiguously
pushMacCommand(&cmd, &this->commandsUp);
} }
// delete the ADR response // delete the ADR response
(void)deleteMacCommand(RADIOLIB_LORAWAN_MAC_LINK_ADR, &this->commandsUp);
} }
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
@ -2246,11 +2244,11 @@ bool LoRaWANNode::execMacCommand(LoRaWANMacCommand_t* cmd, bool saveToEeprom) {
// if this is the first ADR command in the queue, clear all saved channels // if this is the first ADR command in the queue, clear all saved channels
// so we can apply the new channel mask // so we can apply the new channel mask
clearChannels = true; clearChannels = true;
RADIOLIB_DEBUG_PRINTLN("ADR mask: clearing channels");
} else { } else {
// if this is not the first ADR command, clear the ADR response that was in the queue // if this is not the first ADR command, clear the ADR response that was in the queue
(void)deleteMacCommand(RADIOLIB_LORAWAN_MAC_LINK_ADR, &this->commandsUp); (void)deleteMacCommand(RADIOLIB_LORAWAN_MAC_LINK_ADR, &this->commandsUp);
} }
RADIOLIB_DEBUG_PRINTLN("ADR mask: clearing channels");
chMaskAck = (uint8_t)this->applyChannelMaskFix(chMaskCntl, chMask, clearChannels); chMaskAck = (uint8_t)this->applyChannelMaskFix(chMaskCntl, chMask, clearChannels);
} }