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

[LoRaWAN] Allow support for misc MAC commands

Browse source
This commit is contained in:
StevenCellist 2025-01-30 20:58:53 +01:00
parent 5eb90ea17a
commit 27653e1cf7
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1718,14 +1718,14 @@ int16_t LoRaWANNode::parseDownlink(uint8_t* data, size_t* len, LoRaWANEvent_t* e
cid = *mPtr; // MAC id is the first byte cid = *mPtr; // MAC id is the first byte
// fetch length of MAC downlink payload // fetch length of MAC downlink payload
state = this->getMacLen(cid, &fLen, RADIOLIB_LORAWAN_DOWNLINK, true); state = this->getMacLen(cid, &fLen, RADIOLIB_LORAWAN_DOWNLINK, true, mPtr + 1);
if(state != RADIOLIB_ERR_NONE) { if(state != RADIOLIB_ERR_NONE) {
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("WARNING: Unknown MAC CID %02x", cid); RADIOLIB_DEBUG_PROTOCOL_PRINTLN("WARNING: Unknown MAC CID %02x", cid);
RADIOLIB_DEBUG_PROTOCOL_PRINTLN("WARNING: Skipping remaining MAC commands"); RADIOLIB_DEBUG_PROTOCOL_PRINTLN("WARNING: Skipping remaining MAC commands");
break; break;
} }
// already fetch length of MAC answer payload (if any) // already fetch length of MAC answer payload (if any), include CID
uint8_t fLenRe = 0; uint8_t fLenRe = 0;
(void)this->getMacLen(cid, &fLenRe, RADIOLIB_LORAWAN_UPLINK, true); (void)this->getMacLen(cid, &fLenRe, RADIOLIB_LORAWAN_UPLINK, true);
// don't care about return value: the previous getMacLen() would have failed anyway // don't care about return value: the previous getMacLen() would have failed anyway
@ -2484,17 +2484,21 @@ int16_t LoRaWANNode::getMacDeviceTimeAns(uint32_t* gpsEpoch, uint8_t* fraction,
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
int16_t LoRaWANNode::getMacLen(uint8_t cid, uint8_t* len, uint8_t dir, bool inclusive) { int16_t LoRaWANNode::getMacLen(uint8_t cid, uint8_t* len, uint8_t dir, bool inclusive, uint8_t* payload) {
(void)payload;
*len = 0;
if(inclusive) {
*len += 1; // add one byte for CID
}
LoRaWANMacCommand_t cmd = RADIOLIB_LORAWAN_MAC_COMMAND_NONE; LoRaWANMacCommand_t cmd = RADIOLIB_LORAWAN_MAC_COMMAND_NONE;
int16_t state = this->getMacCommand(cid, &cmd); int16_t state = this->getMacCommand(cid, &cmd);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
if(dir == RADIOLIB_LORAWAN_UPLINK) { if(dir == RADIOLIB_LORAWAN_UPLINK) {
*len = cmd.lenUp; *len += cmd.lenUp;
} else { } else {
*len = cmd.lenDn; *len += cmd.lenDn;
}
if(inclusive) {
*len += 1; // add one byte for CID
} }
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
@ -2596,7 +2600,8 @@ void LoRaWANNode::clearMacCommands(uint8_t* inOut, uint8_t* lenInOut, uint8_t di
uint8_t numDeleted = 0; uint8_t numDeleted = 0;
while(i < *lenInOut) { while(i < *lenInOut) {
uint8_t id = inOut[i]; uint8_t id = inOut[i];
uint8_t fLen = 1; // if there is an incorrect MAC command, we should at least move forward by one byte uint8_t fLen = 0;
// include CID byte, so if command fails, we still move one byte forward
(void)this->getMacLen(id, &fLen, dir, true); (void)this->getMacLen(id, &fLen, dir, true);
// only clear MAC command if it should not persist until a downlink is received // only clear MAC command if it should not persist until a downlink is received

3
src/protocols/LoRaWAN/LoRaWAN.h
View file

@ -1030,7 +1030,8 @@ class LoRaWANNode {
// get the length of a certain MAC command in a specific direction (up/down) // get the length of a certain MAC command in a specific direction (up/down)
// if inclusive is true, add one for the CID byte // if inclusive is true, add one for the CID byte
int16_t getMacLen(uint8_t cid, uint8_t* len, uint8_t dir, bool inclusive = false); // include payload in case the MAC command has a dynamic length
virtual int16_t getMacLen(uint8_t cid, uint8_t* len, uint8_t dir, bool inclusive = false, uint8_t* payload = NULL);
// find out of a MAC command should persist destruction // find out of a MAC command should persist destruction
// in uplink direction, some commands must persist if no downlink is received // in uplink direction, some commands must persist if no downlink is received