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

[LoRaWAN] Accept MAC channel mask if ADR is disabled

Browse source
This commit is contained in:
StevenCellist 2025-01-04 16:20:42 +01:00
parent 283bfb43fe
commit a3782b432c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1930,7 +1930,6 @@ bool LoRaWANNode::execMacCommand(uint8_t cid, uint8_t* optIn, uint8_t lenIn, uin
// only acknowledge if the radio is able to operate at or below the requested power level // only acknowledge if the radio is able to operate at or below the requested power level
if(state == RADIOLIB_ERR_NONE || (state == RADIOLIB_ERR_INVALID_OUTPUT_POWER && powerActual < power)) { if(state == RADIOLIB_ERR_NONE || (state == RADIOLIB_ERR_INVALID_OUTPUT_POWER && powerActual < power)) {
pwrAck = 1; pwrAck = 1;
this->txPowerSteps = macTxSteps;
} else { } else {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("ADR failed to configure Tx power %d, code %d!", power, state); RADIOLIB_DEBUG_PROTOCOL_PRINTLN("ADR failed to configure Tx power %d, code %d!", power, state);
} }
@ -1942,10 +1941,17 @@ bool LoRaWANNode::execMacCommand(uint8_t cid, uint8_t* optIn, uint8_t lenIn, uin
// if ACK not completely successful, revert and stop // if ACK not completely successful, revert and stop
if(optOut[0] != 0x07) { if(optOut[0] != 0x07) {
// according to paragraph 4.3.1.1, if ADR is disabled,
// the ADR channel mask must be accepted even if drAck/pwrAck fails.
// therefore, only revert the channel mask if ADR is enabled.
if(this->adrEnabled) {
this->applyChannelMask(chMaskGrp0123, chMaskGrp45); this->applyChannelMask(chMaskGrp0123, chMaskGrp45);
this->setAvailableChannels(chMaskActive); this->setAvailableChannels(chMaskActive);
}
// revert datarate
this->channels[RADIOLIB_LORAWAN_UPLINK].dr = currentDr; this->channels[RADIOLIB_LORAWAN_UPLINK].dr = currentDr;
// Tx power was not modified // Tx power was not actually modified
return(true); return(true);
} }