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

[AX.25] Fixed encoding issue of some frames (#407)

Browse source
This commit is contained in:
jgromes 2021-11-28 14:35:01 +01:00
parent 24ea845c7c
commit 963ef4f36a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,7 +240,7 @@ int16_t AX25Client::sendFrame(AX25Frame* frame) {
frameBuffPtr += RADIOLIB_AX25_MAX_CALLSIGN_LEN; frameBuffPtr += RADIOLIB_AX25_MAX_CALLSIGN_LEN;
// set destination SSID // set destination SSID
*(frameBuffPtr++) = RADIOLIB_AX25_SSID_COMMAND_DEST | RADIOLIB_AX25_SSID_RESERVED_BITS | (frame->destSSID & 0x0F) << 1 | RADIOLIB_AX25_SSID_HDLC_EXTENSION_CONTINUE; *(frameBuffPtr++) = RADIOLIB_AX25_SSID_RESPONSE_DEST | RADIOLIB_AX25_SSID_RESERVED_BITS | (frame->destSSID & 0x0F) << 1 | RADIOLIB_AX25_SSID_HDLC_EXTENSION_CONTINUE;
// set source callsign - all address field bytes are shifted by one bit to make room for HDLC address extension bit // set source callsign - all address field bytes are shifted by one bit to make room for HDLC address extension bit
memset(frameBuffPtr, ' ' << 1, RADIOLIB_AX25_MAX_CALLSIGN_LEN); memset(frameBuffPtr, ' ' << 1, RADIOLIB_AX25_MAX_CALLSIGN_LEN);
@ -250,7 +250,7 @@ int16_t AX25Client::sendFrame(AX25Frame* frame) {
frameBuffPtr += RADIOLIB_AX25_MAX_CALLSIGN_LEN; frameBuffPtr += RADIOLIB_AX25_MAX_CALLSIGN_LEN;
// set source SSID // set source SSID
*(frameBuffPtr++) = RADIOLIB_AX25_SSID_RESPONSE_SOURCE | RADIOLIB_AX25_SSID_RESERVED_BITS | (frame->srcSSID & 0x0F) << 1 | RADIOLIB_AX25_SSID_HDLC_EXTENSION_CONTINUE; *(frameBuffPtr++) = RADIOLIB_AX25_SSID_COMMAND_SOURCE | RADIOLIB_AX25_SSID_RESERVED_BITS | (frame->srcSSID & 0x0F) << 1 | RADIOLIB_AX25_SSID_HDLC_EXTENSION_CONTINUE;
// set repeater callsigns // set repeater callsigns
for(uint16_t i = 0; i < frame->numRepeaters; i++) { for(uint16_t i = 0; i < frame->numRepeaters; i++) {
@ -361,7 +361,7 @@ int16_t AX25Client::sendFrame(AX25Frame* frame) {
// set end flag field (may be split into two bytes due to misalignment caused by extra stuffing bits) // set end flag field (may be split into two bytes due to misalignment caused by extra stuffing bits)
if(trailingLen != 0) { if(trailingLen != 0) {
stuffedFrameBuffLen++; stuffedFrameBuffLen++;
stuffedFrameBuff[stuffedFrameBuffLen - 2] = RADIOLIB_AX25_FLAG >> trailingLen; stuffedFrameBuff[stuffedFrameBuffLen - 2] |= RADIOLIB_AX25_FLAG >> trailingLen;
stuffedFrameBuff[stuffedFrameBuffLen - 1] = RADIOLIB_AX25_FLAG << (8 - trailingLen); stuffedFrameBuff[stuffedFrameBuffLen - 1] = RADIOLIB_AX25_FLAG << (8 - trailingLen);
} else { } else {
stuffedFrameBuff[stuffedFrameBuffLen - 1] = RADIOLIB_AX25_FLAG; stuffedFrameBuff[stuffedFrameBuffLen - 1] = RADIOLIB_AX25_FLAG;