typeOfPacket fix3
This commit is contained in:
parent
22b2c679d2
commit
b9b4f46c66
|
|
@ -237,13 +237,14 @@ namespace Utils {
|
||||||
seventhLineHelper += String(snr);
|
seventhLineHelper += String(snr);
|
||||||
seventhLineHelper += "dBm";
|
seventhLineHelper += "dBm";
|
||||||
|
|
||||||
if (packet.indexOf("::") >= 10) {
|
int firstColonIndex = packet.indexOf(":");
|
||||||
|
if (packet[firstColonIndex + 1] == ':') {
|
||||||
sixthLine += "> MESSAGE";
|
sixthLine += "> MESSAGE";
|
||||||
seventhLine = seventhLineHelper;
|
seventhLine = seventhLineHelper;
|
||||||
} else if (packet.indexOf(":>") >= 10) {
|
} else if (packet[firstColonIndex + 1] == '>') {
|
||||||
sixthLine += "> NEW STATUS";
|
sixthLine += "> NEW STATUS";
|
||||||
seventhLine = seventhLineHelper;
|
seventhLine = seventhLineHelper;
|
||||||
} else if (packet.indexOf(":!") >= 10 || packet.indexOf(":=") >= 10) {
|
} else if (packet[firstColonIndex + 1] == '!' || packet[firstColonIndex + 1] == '=') {
|
||||||
sixthLine += "> GPS BEACON";
|
sixthLine += "> GPS BEACON";
|
||||||
if (!Config.syslog.active) {
|
if (!Config.syslog.active) {
|
||||||
GPS_Utils::getDistanceAndComment(packet); // to be checked!!!
|
GPS_Utils::getDistanceAndComment(packet); // to be checked!!!
|
||||||
|
|
@ -262,15 +263,15 @@ namespace Utils {
|
||||||
seventhLine += "D:";
|
seventhLine += "D:";
|
||||||
seventhLine += distance;
|
seventhLine += distance;
|
||||||
seventhLine += "km";
|
seventhLine += "km";
|
||||||
} else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) {
|
} else if (packet[firstColonIndex + 1] == '`') {
|
||||||
sixthLine += "> TELEMETRY";
|
|
||||||
seventhLine = seventhLineHelper;
|
|
||||||
} else if (packet.indexOf(":`") >= 10 || packet.indexOf(":'") >= 10) {
|
|
||||||
sixthLine += "> MIC-E";
|
sixthLine += "> MIC-E";
|
||||||
seventhLine = seventhLineHelper;
|
seventhLine = seventhLineHelper;
|
||||||
} else if (packet.indexOf(":;") >= 10) {
|
} else if (packet[firstColonIndex + 1] == ';') {
|
||||||
sixthLine += "> OBJECT";
|
sixthLine += "> OBJECT";
|
||||||
seventhLine = seventhLineHelper;
|
seventhLine = seventhLineHelper;
|
||||||
|
} else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) {
|
||||||
|
sixthLine += "> TELEMETRY";
|
||||||
|
seventhLine = seventhLineHelper;
|
||||||
} else {
|
} else {
|
||||||
sixthLine += "> ??????????";
|
sixthLine += "> ??????????";
|
||||||
seventhLine = seventhLineHelper;
|
seventhLine = seventhLineHelper;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue