VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 18:15:45 -05:00
Code Issues Projects Releases Wiki Activity

Adding Debug lines to APRSPacket::parseMicE, adding regex match for Mic-E APRS

Browse Source
This commit is contained in:
Peter Beckman 2022-01-19 15:39:20 -05:00
parent cd9bf5770e
commit de66c8cb3a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdrbase/util/aprs.cpp
View File

@ -36,7 +36,8 @@ bool APRSPacket::decode(AX25Packet packet)
{ {
// Check destination address // Check destination address
QRegExp re("^(AIR.*|ALL.*|AP.*|BEACON|CQ.*|GPS.*|DF.*|DGPS.*|DRILL.*|DX.*|ID.*|JAVA.*|MAIL.*|MICE.*|QST.*|QTH.*|RTCM.*|SKY.*|SPACE.*|SPC.*|SYM.*|TEL.*|TEST.*|TLM.*|WX.*|ZIP.*)"); QRegExp re("^(AIR.*|ALL.*|AP.*|BEACON|CQ.*|GPS.*|DF.*|DGPS.*|DRILL.*|DX.*|ID.*|JAVA.*|MAIL.*|MICE.*|QST.*|QTH.*|RTCM.*|SKY.*|SPACE.*|SPC.*|SYM.*|TEL.*|TEST.*|TLM.*|WX.*|ZIP.*)");
if (re.exactMatch(packet.m_to)) QRegExp re_mice("^[A-LP-Z0-9]{3}[L-Z0-9]{3}.?$"); // Mic-E Encoded Destination, 6-7 bytes
if (re.exactMatch(packet.m_to) || re_mice.exactMatch(packet.m_to))
{ {
m_from = packet.m_from; m_from = packet.m_from;
m_to = packet.m_to; m_to = packet.m_to;
@ -165,9 +166,14 @@ bool APRSPacket::decode(AX25Packet packet)
} }
return true; return true;
} else {
qDebug() << "APRSPacket::decode: AX.25 Destination did not match known regexp " << m_to;
} }
} else {
qDebug() << "APRSPacket::decode: Invalid value in type=" << packet.m_type << " pid=" << packet.m_pid << " length of " << packet.m_dataASCII;
} }
return false; return false;
} }
@ -1002,10 +1008,12 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
{ {
// Mic-E Location data is encoded in the AX.25 Destination Address // Mic-E Location data is encoded in the AX.25 Destination Address
if (dest.length() < 6) if (dest.length() < 6)
qDebug() << "APRSPacket::parseMicE: Destination invalid length " << dest;
return false; return false;
// Mic-E Information data is 8 bytes minimum, 13-14 with altitude // Mic-E Information data is 8 bytes minimum, 13-14 with altitude
if (info.length() < idx+8) if (info.length() < idx+8)
qDebug() << "APRSPacket::parseMicE: Information Data invalid length " << info;
return false; return false;
QString latDigits = ""; QString latDigits = "";
@ -1065,6 +1073,7 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
m_hasPosition = true; m_hasPosition = true;
} else { } else {
qDebug() << "APRSPacket::parseMicE: Destination invalid regexp match " << dest;
return false; return false;
} }
@ -1104,7 +1113,7 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
// Course and Speed // Course and Speed
int speed = ((charToInt(info, idx+3) - 28) * 10) % 800; // Speed in 10 kts units int speed = ((charToInt(info, idx+3) - 28) * 10) % 800; // Speed in 10 kts units
float decoded_speed_course = (charToInt(info, idx+4) - 28) / 10; float decoded_speed_course = (float)(charToInt(info, idx+4) - 28) / 10.0;
speed += floor(decoded_speed_course); // Speed in 1 kt units, added to above speed += floor(decoded_speed_course); // Speed in 1 kt units, added to above
int course = (((charToInt(info, idx+4) - 28) % 10) * 100) % 400; int course = (((charToInt(info, idx+4) - 28) % 10) * 100) % 400;
course += charToInt(info, idx+5) - 28; course += charToInt(info, idx+5) - 28;
@ -1115,12 +1124,15 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
m_symbolCode = info[idx+6].toLatin1(); m_symbolCode = info[idx+6].toLatin1();
m_hasSymbol = true; m_hasSymbol = true;
} else { } else {
qDebug() << "APRSPacket::parseMicE: Information Data invalid ASCII range " << info;
return false; return false;
} }
// Altitude // Altitude
// #TODO // #TODO
qDebug() << "APRSPacket::parseMicE: Successfully Decoded Maybe";
return true; return true;
} }