mirror
/
RadioLib
kopia lustrzana https://github.com/jgromes/RadioLib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

[AX25] Fixed extension bits and repeater callsigns

pull/403/head
jgromes 2021-09-28 21:33:02 +02:00
rodzic 2125dfe276
commit aa1b84ce1c
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
src/protocols/AX25/AX25.cpp
Wyświetl plik

@ -126,7 +126,7 @@ int16_t AX25Frame::setRepeaters(char** repeaterCallsigns, uint8_t* repeaterSSIDs
#ifndef RADIOLIB_STATIC_ONLY #ifndef RADIOLIB_STATIC_ONLY
this->repeaterCallsigns = new char*[numRepeaters]; this->repeaterCallsigns = new char*[numRepeaters];
for(uint8_t i = 0; i < numRepeaters; i++) { for(uint8_t i = 0; i < numRepeaters; i++) {
this->repeaterCallsigns[i] = new char[strlen(repeaterCallsigns[i])]; this->repeaterCallsigns[i] = new char[strlen(repeaterCallsigns[i]) + 1];
} }
this->repeaterSSIDs = new uint8_t[numRepeaters]; this->repeaterSSIDs = new uint8_t[numRepeaters];
#endif #endif
@ -135,6 +135,7 @@ int16_t AX25Frame::setRepeaters(char** repeaterCallsigns, uint8_t* repeaterSSIDs
this->numRepeaters = numRepeaters; this->numRepeaters = numRepeaters;
for(uint8_t i = 0; i < numRepeaters; i++) { for(uint8_t i = 0; i < numRepeaters; i++) {
memcpy(this->repeaterCallsigns[i], repeaterCallsigns[i], strlen(repeaterCallsigns[i])); memcpy(this->repeaterCallsigns[i], repeaterCallsigns[i], strlen(repeaterCallsigns[i]));
this->repeaterCallsigns[i][strlen(repeaterCallsigns[i])] = '\0';
} }
memcpy(this->repeaterSSIDs, repeaterSSIDs, numRepeaters); memcpy(this->repeaterSSIDs, repeaterSSIDs, numRepeaters);
@ -249,7 +250,7 @@ int16_t AX25Client::sendFrame(AX25Frame* frame) {
frameBuffPtr += AX25_MAX_CALLSIGN_LEN; frameBuffPtr += AX25_MAX_CALLSIGN_LEN;
// set source SSID // set source SSID
*(frameBuffPtr++) = AX25_SSID_COMMAND_SOURCE | AX25_SSID_RESERVED_BITS | (frame->srcSSID & 0x0F) << 1 | AX25_SSID_HDLC_EXTENSION_END; *(frameBuffPtr++) = AX25_SSID_COMMAND_SOURCE | AX25_SSID_RESERVED_BITS | (frame->srcSSID & 0x0F) << 1 | 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++) {
@ -262,7 +263,7 @@ int16_t AX25Client::sendFrame(AX25Frame* frame) {
} }
// set HDLC extension end bit // set HDLC extension end bit
*frameBuffPtr |= AX25_SSID_HDLC_EXTENSION_END; *(frameBuffPtr - 1) |= AX25_SSID_HDLC_EXTENSION_END;
// set sequence numbers of the frames that have it // set sequence numbers of the frames that have it
uint8_t controlField = frame->control; uint8_t controlField = frame->control;