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

[LoRaWAN] fix CSMA calling now incorrect function

Browse source
This commit is contained in:
StevenCellist 2023-11-03 23:52:32 +01:00
parent 3b466ca919
commit 60f50e0a04
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -327,7 +327,6 @@ int16_t LoRaWANNode::beginOTAA(uint64_t joinEUI, uint64_t devEUI, uint8_t* nwkKe
this->rxDelays[1] = this->rxDelays[0] + 1000; this->rxDelays[1] = this->rxDelays[0] + 1000;
// process CFlist if present // process CFlist if present
uint8_t cfList[RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_LEN] = { 0 };
if(lenRx == RADIOLIB_LORAWAN_JOIN_ACCEPT_MAX_LEN) { if(lenRx == RADIOLIB_LORAWAN_JOIN_ACCEPT_MAX_LEN) {
uint8_t cfList[RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_LEN] = { 0 }; uint8_t cfList[RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_LEN] = { 0 };
memcpy(&cfList[0], &joinAcceptMsg[RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_POS], RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_LEN); memcpy(&cfList[0], &joinAcceptMsg[RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_POS], RADIOLIB_LORAWAN_JOIN_ACCEPT_CFLIST_LEN);
@ -2095,7 +2094,7 @@ void LoRaWANNode::performCSMA() {
RADIOLIB_DEBUG_PRINTLN("OCCUPIED CHANNEL DURING DIFS"); RADIOLIB_DEBUG_PRINTLN("OCCUPIED CHANNEL DURING DIFS");
channelFreeDuringDIFS = false; channelFreeDuringDIFS = false;
// Channel is occupied during DIFS, hop to another. // Channel is occupied during DIFS, hop to another.
this->setupChannels(); this->selectChannels();
break; break;
} }
} }
@ -2107,7 +2106,7 @@ void LoRaWANNode::performCSMA() {
if (performCAD()) { if (performCAD()) {
RADIOLIB_DEBUG_PRINTLN("OCCUPIED CHANNEL DURING BO"); RADIOLIB_DEBUG_PRINTLN("OCCUPIED CHANNEL DURING BO");
// Channel is busy during CAD, hop to another and return to DIFS state again. // Channel is busy during CAD, hop to another and return to DIFS state again.
this->setupChannels(); this->selectChannels();
break; // Exit loop. Go back to DIFS state. break; // Exit loop. Go back to DIFS state.
} }
BO--; // Decrement BO by one if channel is free BO--; // Decrement BO by one if channel is free