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

[LoRaWAN] fix popping MAC command from queue

Browse source 
I just realized that the method popMacCommand did not correctly remove items from the queue - this should solve the problem
This commit is contained in:
StevenCellist 2023-09-22 16:06:18 +02:00
parent e3cede064a
commit e143972964
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1369,9 +1369,7 @@ int16_t LoRaWANNode::popMacCommand(LoRaWANMacCommand_t* cmd, LoRaWANMacCommandQu
if(queue->commands[index].repeat > 0) { if(queue->commands[index].repeat > 0) {
queue->commands[index].repeat--; queue->commands[index].repeat--;
} else { } else {
queue->len -= (1 + queue->commands[index].len); // 1 byte for command ID, len for payload deleteMacCommand(queue->commands[index].cid, queue);
memset(&queue->commands[index], 0x00, sizeof(LoRaWANMacCommand_t));
queue->numCommands--;
} }
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
@ -1394,9 +1392,11 @@ int16_t LoRaWANNode::deleteMacCommand(uint8_t cid, LoRaWANMacCommandQueue_t* que
// queue->commands[index].payload[4], // queue->commands[index].payload[4],
// queue->commands[index].repeat); // queue->commands[index].repeat);
queue->len -= (1 + queue->commands[index].len); // 1 byte for command ID, len for payload queue->len -= (1 + queue->commands[index].len); // 1 byte for command ID, len for payload
// move all subsequent commands one forward in the queue
if(index < RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - 1) { if(index < RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - 1) {
memmove(&queue->commands[index], &queue->commands[index + 1], (RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - index) * sizeof(LoRaWANMacCommand_t)); memmove(&queue->commands[index], &queue->commands[index + 1], (RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - index) * sizeof(LoRaWANMacCommand_t));
} }
// set the latest element to all 0
memset(&queue->commands[RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - 1], 0x00, sizeof(LoRaWANMacCommand_t)); memset(&queue->commands[RADIOLIB_LORAWAN_MAC_COMMAND_QUEUE_SIZE - 1], 0x00, sizeof(LoRaWANMacCommand_t));
queue->numCommands--; queue->numCommands--;
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);