richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-03-11 16:03:58 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

avoid 3 bytes again

Browse source
This commit is contained in:
richonguzman 2024-06-08 15:50:55 -04:00
parent 7537c1ee50
commit 49cffe7d0c
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/aprs_is_utils.cpp
View file

@ -107,10 +107,14 @@ namespace APRS_IS_Utils {
}
String buildPacketToUpload(const String& packet) {
String payload = packet.substring(packet.indexOf(":"));
if (payload.indexOf("\x3c\xff\x01") != -1) {
payload = payload.substring(0, payload.indexOf("\x3c\xff\x01"));
}
if (!(Config.aprs_is.active && Config.digi.mode == 0)) { // Check if NOT only IGate
return packet.substring(3, packet.indexOf(":")) + ",qAR," + Config.callsign + packet.substring(packet.indexOf(":"));
return packet.substring(3, packet.indexOf(":")) + ",qAR," + Config.callsign + payload;
} else {
return packet.substring(3, packet.indexOf(":")) + ",qAO," + Config.callsign + packet.substring(packet.indexOf(":"));
return packet.substring(3, packet.indexOf(":")) + ",qAO," + Config.callsign + payload;
}
}
@ -202,6 +206,9 @@ namespace APRS_IS_Utils {
Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
Addressee.trim();
if (packet.indexOf("::") > 10 && Addressee == Config.callsign) { // its a message for me!
if (AddresseeAndMessage.indexOf("\x3c\xff\x01") != -1) {
AddresseeAndMessage = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf("\x3c\xff\x01"));
}
queryMessage = processReceivedLoRaMessage(Sender, AddresseeAndMessage);
}
if (!queryMessage) {

7
src/digi_utils.cpp
View file

@ -43,7 +43,12 @@ namespace DIGI_Utils {
repeatedPacket += temp0.substring(0, temp0.indexOf(",")); // tocall
repeatedPacket += ",";
repeatedPacket += path;
repeatedPacket += packet.substring(packet.indexOf(":"));
String payload = packet.substring(packet.indexOf(":"));
if (payload.indexOf("\x3c\xff\x01") != -1) {
payload = payload.substring(0, payload.indexOf("\x3c\xff\x01"));
}
repeatedPacket += payload;
return repeatedPacket;
} else {
return "";