From de66c8cb3a9dbd8236ceea1b25272e6319a1f6e5 Mon Sep 17 00:00:00 2001
From: Peter Beckman <beckman@angryox.com>
Date: Wed, 19 Jan 2022 15:39:20 -0500
Subject: [PATCH] Adding Debug lines to APRSPacket::parseMicE, adding regex
 match for Mic-E APRS

---
 sdrbase/util/aprs.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sdrbase/util/aprs.cpp b/sdrbase/util/aprs.cpp
index 064bd3319..44d876501 100644
--- a/sdrbase/util/aprs.cpp
+++ b/sdrbase/util/aprs.cpp
@@ -36,7 +36,8 @@ bool APRSPacket::decode(AX25Packet packet)
     {
         // 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.*)");
-        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_to = packet.m_to;
@@ -165,9 +166,14 @@ bool APRSPacket::decode(AX25Packet packet)
             }
 
             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;
 }
 
@@ -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
     if (dest.length() < 6)
+        qDebug() << "APRSPacket::parseMicE: Destination invalid length " << dest;
         return false;
 
     // Mic-E Information data is 8 bytes minimum, 13-14 with altitude
     if (info.length() < idx+8)
+        qDebug() << "APRSPacket::parseMicE: Information Data invalid length " << info;
         return false;
 
     QString latDigits = "";
@@ -1065,6 +1073,7 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
         m_hasPosition = true;
 
     } else {
+        qDebug() << "APRSPacket::parseMicE: Destination invalid regexp match " << dest;
         return false;
     }
 
@@ -1104,7 +1113,7 @@ bool APRSPacket::parseMicE(QString& info, int& idx, QString& dest)
         // Course and Speed
 
         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
         int course = (((charToInt(info, idx+4) - 28) % 10) * 100) % 400;
         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_hasSymbol = true;
     } else {
+        qDebug() << "APRSPacket::parseMicE: Information Data invalid ASCII range " << info;
         return false;
     }
 
     // Altitude
     // #TODO
 
+    qDebug() << "APRSPacket::parseMicE: Successfully Decoded Maybe";
+
     return true;
 }