mirror
/
RadioLib
kopia lustrzana https://github.com/jgromes/RadioLib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

[LoRaWAN] Fix ADR bug if not enabled

pull/918/head
StevenCellist 2024-01-05 13:41:00 +01:00
rodzic 00264f48a9
commit f7730463bd
1 zmienionych plików z 40 dodań i 38 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

78
src/protocols/LoRaWAN/LoRaWAN.cpp
Wyświetl plik

@ -912,52 +912,54 @@ int16_t LoRaWANNode::uplink(uint8_t* data, size_t len, uint8_t port, bool isConf
// increase frame counter by one // increase frame counter by one
this->fcntUp += 1; this->fcntUp += 1;
// check if we need to do ADR stuff
uint32_t adrLimit = 0x01 << this->adrLimitExp;
uint32_t adrDelay = 0x01 << this->adrDelayExp;
bool adrAckReq = false; bool adrAckReq = false;
if((this->fcntUp - this->adrFcnt) >= adrLimit) { if(this->adrEnabled) {
adrAckReq = true; // check if we need to do ADR stuff
} uint32_t adrLimit = 0x01 << this->adrLimitExp;
// if we hit the Limit + Delay, try one of three, in order: uint32_t adrDelay = 0x01 << this->adrDelayExp;
// set TxPower to max, set DR to min, enable all defined channels if((this->fcntUp - this->adrFcnt) >= adrLimit) {
if ((this->fcntUp - this->adrFcnt) == (adrLimit + adrDelay)) { adrAckReq = true;
}
// if the TxPower field has some offset, remove it and switch to maximum power // if we hit the Limit + Delay, try one of three, in order:
if(this->txPowerCur > 0) { // set TxPower to max, set DR to min, enable all defined channels
this->txPowerCur = 0; if ((this->fcntUp - this->adrFcnt) == (adrLimit + adrDelay)) {
// set the maximum power supported by both the module and the band
state = this->setTxPower(this->txPowerMax); // if the TxPower field has some offset, remove it and switch to maximum power
RADIOLIB_ASSERT(state); if(this->txPowerCur > 0) {
this->txPowerCur = 0;
} else { // set the maximum power supported by both the module and the band
// failed to increase Tx power, so try to decrease the datarate state = this->setTxPower(this->txPowerMax);
if(this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK] > this->currentChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK].drMin) { RADIOLIB_ASSERT(state);
this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK]--;
this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_DOWNLINK]--;
} else { } else {
// failed to increase Tx power, so try to decrease the datarate
if(this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK] > this->currentChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK].drMin) {
this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK]--;
this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_DOWNLINK]--;
} else {
// failed to decrease datarate, so enable all available channels // failed to decrease datarate, so enable all available channels
for(size_t i = 0; i < RADIOLIB_LORAWAN_NUM_AVAILABLE_CHANNELS; i++) { for(size_t i = 0; i < RADIOLIB_LORAWAN_NUM_AVAILABLE_CHANNELS; i++) {
if(this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK][i].idx != RADIOLIB_LORAWAN_CHANNEL_INDEX_NONE) { if(this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK][i].idx != RADIOLIB_LORAWAN_CHANNEL_INDEX_NONE) {
this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK][i].enabled = true; this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK][i].enabled = true;
this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_DOWNLINK][i].enabled = true; this->availableChannels[RADIOLIB_LORAWAN_CHANNEL_DIR_DOWNLINK][i].enabled = true;
}
} }
} }
} }
LoRaWANMacCommand_t cmd;
cmd.cid = RADIOLIB_LORAWAN_MAC_LINK_ADR;
cmd.len = MacTable[RADIOLIB_LORAWAN_MAC_LINK_ADR].lenDn;
cmd.payload[0] = (this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK] << 4);
cmd.payload[0] |= 0; // default to max Tx Power
cmd.payload[3] |= (1 << 7); // set the RFU bit, which means that the channel mask gets ignored
(void)execMacCommand(&cmd);
// we tried something to improve the range, so increase the ADR frame counter by 'ADR delay'
this->adrFcnt += adrDelay;
} }
LoRaWANMacCommand_t cmd;
cmd.cid = RADIOLIB_LORAWAN_MAC_LINK_ADR;
cmd.len = MacTable[RADIOLIB_LORAWAN_MAC_LINK_ADR].lenDn;
cmd.payload[0] = (this->dataRates[RADIOLIB_LORAWAN_CHANNEL_DIR_UPLINK] << 4);
cmd.payload[0] |= 0; // default to max Tx Power
cmd.payload[3] |= (1 << 7); // set the RFU bit, which means that the channel mask gets ignored
(void)execMacCommand(&cmd);
// we tried something to improve the range, so increase the ADR frame counter by 'ADR delay'
this->adrFcnt += adrDelay;
} }
// configure for uplink // configure for uplink