From faa70a33d89c697f3f58712a713feae63816a659 Mon Sep 17 00:00:00 2001 From: richonguzman Date: Fri, 8 Dec 2023 17:04:05 -0300 Subject: [PATCH] updated indicator of Mic-e --- src/aprs_is_utils.cpp | 4 ++-- src/station_utils.cpp | 2 +- src/syslog_utils.cpp | 2 +- src/utils.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp index 0f1bb30..d190bc1 100644 --- a/src/aprs_is_utils.cpp +++ b/src/aprs_is_utils.cpp @@ -72,9 +72,9 @@ namespace APRS_IS_Utils { String createPacket(String packet) { if (stationMode>1) { - return packet.substring(3, packet.indexOf(':')) + ",qAR," + Config.callsign + packet.substring(packet.indexOf(':')) + "\n"; + return packet.substring(3, packet.indexOf(":`")) + ",qAR," + Config.callsign + packet.substring(packet.indexOf(":`")) + "\n"; } else { - return packet.substring(3, packet.indexOf(':')) + ",qAO," + Config.callsign + packet.substring(packet.indexOf(':')) + "\n"; + return packet.substring(3, packet.indexOf(":`")) + ",qAO," + Config.callsign + packet.substring(packet.indexOf(":`")) + "\n"; } } diff --git a/src/station_utils.cpp b/src/station_utils.cpp index 5b34185..e7b7ead 100644 --- a/src/station_utils.cpp +++ b/src/station_utils.cpp @@ -89,7 +89,7 @@ void checkBuffer() { } void updatePacketBuffer(String packet) { - if ((packet.indexOf(":!") == -1) && (packet.indexOf(":=") == -1) && (packet.indexOf(":>") == -1) && (packet.indexOf(":'") == -1)) { + if ((packet.indexOf(":!") == -1) && (packet.indexOf(":=") == -1) && (packet.indexOf(":>") == -1) && (packet.indexOf(":`") == -1)) { String sender = packet.substring(3,packet.indexOf(">")); String tempAddressee = packet.substring(packet.indexOf("::") + 2); String addressee = tempAddressee.substring(0,tempAddressee.indexOf(":")); diff --git a/src/syslog_utils.cpp b/src/syslog_utils.cpp index 299aa6d..b5cc7fc 100644 --- a/src/syslog_utils.cpp +++ b/src/syslog_utils.cpp @@ -33,7 +33,7 @@ void log(String type, String packet, int rssi, float snr, int freqError) { } else if (packet.indexOf(":>") > 10) { syslogPacket += type + " - STATUS - " + packet.substring(3,packet.indexOf(">")) + " ---> " + packet.substring(packet.indexOf(":>")+2); syslogPacket += " / " + String(rssi) + "dBm / " + String(snr) + "dB / " + String(freqError) + "Hz"; - } else if (packet.indexOf(":'") > 10) { + } else if (packet.indexOf(":`") > 10) { syslogPacket += type + " - MIC-E - " + packet.substring(3,packet.indexOf(">")) + " ---> " + packet.substring(packet.indexOf("::")+2); syslogPacket += " / " + String(rssi) + "dBm / " + String(snr) + "dB / " + String(freqError) + "Hz"; } else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) { diff --git a/src/utils.cpp b/src/utils.cpp index 162643e..410da5b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -301,7 +301,7 @@ namespace Utils { } else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) { sixthLine = sender + "> TELEMETRY"; seventhLine = "RSSI:" + String(rssi) + "dBm SNR: " + String(snr) + "dBm"; - } else if (packet.indexOf(":'") >= 10) { + } else if (packet.indexOf(":`") >= 10) { sixthLine = sender + "> MIC-E"; seventhLine = "RSSI:" + String(rssi) + "dBm SNR: " + String(snr) + "dBm"; } else if (packet.indexOf(":;") >= 10) {