KB8PMY
/
F4KXL_DStarGateway
mirror of https://github.com/F4FXL/DStarGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#9 add telemetry parsing

Browse Source
pull/32/head
Geoffrey Merck 4 years ago
parent 30d74f1f10
commit 0db54e5026
4 changed files with 204 additions and 106 deletions
Show Stats Download Patch File Download Diff File

10
.vscode/tasks.json vendored
Unescape View File

@ -12,10 +12,7 @@
"ENABLE_DEBUG=1",
"USE_GPSD=1"
],
"group": {
"kind": "build",
"isDefault": true
},
"group": "build",
"problemMatcher": []
},
{
@ -28,7 +25,10 @@
"ENABLE_DEBUG=1",
"USE_GPSD=1"
],
"group": "build",
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": []
}
]

3
APRSFrame.h
Unescape View File

@ -29,7 +29,8 @@ enum APRS_FRAME_TYPE {
APFT_NMEA,
APFT_STATUS,
APFT_OBJECT,
APFT_WX
APFT_WX,
APFT_TELEMETRY
};
class CAPRSFrame {

21
APRSParser.cpp
Unescape View File

@ -106,9 +106,21 @@ bool CAPRSParser::parseInt(CAPRSFrame& frame)
}
break;
case ':':
if(body[9] == ':' && std::all_of(body.begin(), body.begin() + 9,
[](char c){ return c == ' ' || c == '-' || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'); }))
// we have either message or telemetry labels or telemetry EQNS
if(body[9] == ':'
&& std::all_of(body.begin(), body.begin() + 9, [](char c){ return c == ' ' || c == '-' || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'); })) {
type = APFT_MESSAGE;
//If reciepient is same as source and we donot have a sequence number at the end of message, Then it is telemetry
if(body.find(frame.getSource()) == 0U) {
auto eqnsPos = body.find("EQNS.");
auto parmPos = body.find("PARM.");
auto seqNumPos = body.find_last_of('{');
if((eqnsPos == 10U || parmPos == 10U) && seqNumPos == std::string::npos) {
type = APFT_TELEMETRY;
}
}
}
break;
case '>':
type = APFT_STATUS;
@ -121,6 +133,11 @@ bool CAPRSParser::parseInt(CAPRSFrame& frame)
case '{':
type = APFT_UNKNOWN; //
break;
case 'T':
if(body[0] == '#') {
type = APFT_TELEMETRY;
}
break;
default:
type = APFT_UNKNOWN;
break;

276
Tests/APRSParser/parseAPRSFrame.cpp
Unescape View File

@ -20,102 +20,182 @@
#include "../../APRSParser.h"
class APRSParser_parseAPRSFrame : public ::testing::Test {
};
TEST_F(APRSParser_parseAPRSFrame, EmpyString) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, NoSourceCallsign) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame(">APRS::F4ABC Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, NoDestCallsign) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>::F4ABC Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, CorrectMessageFrameWithDigipeater) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS,WIDE1-1,WIDE2-2::F4ABC :Test Message", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "N0CALL");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 2);
EXPECT_STREQ(aprsFrame.getPath()[0].c_str(), "WIDE1-1");
EXPECT_STREQ(aprsFrame.getPath()[1].c_str(), "WIDE2-2");
}
TEST_F(APRSParser_parseAPRSFrame, CorrectMessageFrameWithoutDigipeater) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS::F4ABC :Test Message", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "N0CALL");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, InvalidMessageFrame) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS::F4ABC&@#$:Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
//
TEST_F(APRSParser_parseAPRSFrame, ID51) {
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F4FXL-8>API51,DSTAR:!1234.56N/12345.67E[/A=000886QRV DStar\r\r\n", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "!1234.56N/12345.67E[/A=000886QRV DStar\r\r\n");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "API51");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F4FXL-8");
EXPECT_EQ(aprsFrame.getType(), APFT_POSITION);
EXPECT_EQ(aprsFrame.getPath().size(), 1);
EXPECT_STREQ(aprsFrame.getPath()[0].c_str(), "DSTAR");
namespace APRSParserTests
{
class APRSParser_parseAPRSFrame : public ::testing::Test {
};
TEST_F(APRSParser_parseAPRSFrame, EmpyString)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, NoSourceCallsign)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame(">APRS::F4ABC Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, NoDestCallsign)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>::F4ABC Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, CorrectMessageFrameWithDigipeater)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS,WIDE1-1,WIDE2-2::F4ABC :Test Message", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "N0CALL");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 2);
EXPECT_STREQ(aprsFrame.getPath()[0].c_str(), "WIDE1-1");
EXPECT_STREQ(aprsFrame.getPath()[1].c_str(), "WIDE2-2");
}
TEST_F(APRSParser_parseAPRSFrame, CorrectMessageFrameWithoutDigipeater)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS::F4ABC :Test Message", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "N0CALL");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, InvalidMessageFrame)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("N0CALL>APRS::F4ABC&@#$:Test Message", aprsFrame);
EXPECT_FALSE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "");
EXPECT_EQ(aprsFrame.getType(), APFT_UNKNOWN);
EXPECT_EQ(aprsFrame.getPath().size(), 0U);
}
TEST_F(APRSParser_parseAPRSFrame, ID51)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F4FXL-8>API51,DSTAR:!1234.56N/12345.67E[/A=000886QRV DStar\r\r\n", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "!1234.56N/12345.67E[/A=000886QRV DStar\r\r\n");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "API51");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F4FXL-8");
EXPECT_EQ(aprsFrame.getType(), APFT_POSITION);
EXPECT_EQ(aprsFrame.getPath().size(), 1);
EXPECT_STREQ(aprsFrame.getPath()[0].c_str(), "DSTAR");
}
TEST_F(APRSParser_parseAPRSFrame, telemetryLabels)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F5ZEE-C>APRS::F5ZEE-C :PARM.PA Temp", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F5ZEE-C :PARM.PA Temp");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F5ZEE-C");
EXPECT_EQ(aprsFrame.getType(), APFT_TELEMETRY);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, telemetryEQNS)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F5ZEE-C>APRS::F5ZEE-C :EQNS.0,0.16016,-40,0,0,0,0,0,0,0,0,0,0,0,0", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F5ZEE-C :EQNS.0,0.16016,-40,0,0,0,0,0,0,0,0,0,0,0,0");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F5ZEE-C");
EXPECT_EQ(aprsFrame.getType(), APFT_TELEMETRY);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, telemetryEQNSWithSeqnum)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F5ZEE-C>APRS::F5ZEE-C :EQNS.0,0.16016,-40,0,0,0,0,0,0,0,0,0,0,0,0{ABCD", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F5ZEE-C :EQNS.0,0.16016,-40,0,0,0,0,0,0,0,0,0,0,0,0{ABCD");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F5ZEE-C");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, telemetryReport)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F5ZEE-C>APRS:T#581,342,000,000,000,000,00000000", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), "T#581,342,000,000,000,000,00000000");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F5ZEE-C");
EXPECT_EQ(aprsFrame.getType(), APFT_TELEMETRY);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, messageToSelf)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F4ABC>APRS::F4ABC :Test Message{ABCD", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message{ABCD");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F4ABC");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
TEST_F(APRSParser_parseAPRSFrame, messageToSelfNoSeqNum)
{
CAPRSFrame aprsFrame;
bool retVal = CAPRSParser::parseFrame("F4ABC>APRS::F4ABC :Test Message", aprsFrame);
EXPECT_TRUE(retVal);
EXPECT_STRCASEEQ(aprsFrame.getBody().c_str(), ":F4ABC :Test Message");
EXPECT_STRCASEEQ(aprsFrame.getDestination().c_str(), "APRS");
EXPECT_STRCASEEQ(aprsFrame.getSource().c_str(), "F4ABC");
EXPECT_EQ(aprsFrame.getType(), APFT_MESSAGE);
EXPECT_EQ(aprsFrame.getPath().size(), 0);
}
}
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.