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

[LoRaWAN] Remove redundant PHY check

Browse source
This commit is contained in:
StevenCellist 2024-08-17 22:04:28 +02:00
parent 0bc0e3d9c8
commit 647fa23ce9
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1196,6 +1196,8 @@ int16_t LoRaWANNode::downlinkCommon() {
this->phyLayer->setPacketReceivedAction(LoRaWANNodeOnDownlinkAction); this->phyLayer->setPacketReceivedAction(LoRaWANNodeOnDownlinkAction);
int16_t timedOut = 0;
// perform listening in the two Rx windows // perform listening in the two Rx windows
for(uint8_t i = 0; i < 2; i++) { for(uint8_t i = 0; i < 2; i++) {
downlinkAction = false; downlinkAction = false;
@ -1226,11 +1228,11 @@ int16_t LoRaWANNode::downlinkCommon() {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("Closing Rx%d window", i+1); RADIOLIB_DEBUG_PROTOCOL_PRINTLN("Closing Rx%d window", i+1);
// check if the IRQ bit for Rx Timeout is set // check if the IRQ bit for Rx Timeout is set
state = this->phyLayer->checkIrq(RADIOLIB_IRQ_TIMEOUT); timedOut = this->phyLayer->checkIrq(RADIOLIB_IRQ_TIMEOUT);
if(state == RADIOLIB_ERR_UNSUPPORTED) { if(timedOut == RADIOLIB_ERR_UNSUPPORTED) {
return(state); return(timedOut);
} }
if(state == 0) { if(!timedOut) {
break; break;
} else if(i == 0) { } else if(i == 0) {
@ -1252,11 +1254,7 @@ int16_t LoRaWANNode::downlinkCommon() {
this->rxDelayEnd = mod->hal->millis(); this->rxDelayEnd = mod->hal->millis();
// if we got here due to a timeout, stop ongoing activities // if we got here due to a timeout, stop ongoing activities
state = this->phyLayer->checkIrq(RADIOLIB_IRQ_TIMEOUT); if(timedOut) {
if(state == RADIOLIB_ERR_UNSUPPORTED) {
return(state);
}
if(state == 1) {
this->phyLayer->standby(); // TODO check: this should be done automagically due to RxSingle? this->phyLayer->standby(); // TODO check: this should be done automagically due to RxSingle?
if(this->modulation == RADIOLIB_LORAWAN_MODULATION_LORA) { if(this->modulation == RADIOLIB_LORAWAN_MODULATION_LORA) {
this->phyLayer->invertIQ(false); this->phyLayer->invertIQ(false);