From 9769996717c298141320b73a3031d9d8be071200 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Tue, 6 Jun 2023 17:25:50 -0400
Subject: [PATCH] update destination

---
 src/LoRa_APRS_iGate.cpp | 37 ++-----------------------------------
 src/gps_utils.cpp       |  2 +-
 src/query_utils.cpp     |  4 ++--
 src/utils.cpp           |  2 +-
 4 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 7b0bbd1..8bc892c 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -39,39 +39,6 @@ std::vector<String> lastHeardStation_temp;
 
 String firstLine, secondLine, thirdLine, fourthLine, iGateBeaconPacket;
 
-/*String processQueryAnswer(String query, String station, String queryOrigin) {
-  String processedQuery, queryAnswer;
-  if (query=="?APRS?" || query=="?aprs?" || query=="?Aprs?" || query=="H" || query=="h" || query=="Help" || query=="help" || query=="?") {
-    processedQuery = "?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign";
-  } else if (query=="?APRSV" || query=="?aprsv" || query=="?Aprsv") {
-    processedQuery = Config.aprs_is.softwareName + " " + Config.aprs_is.softwareVersion;
-  } else if (query=="?APRSP" || query=="?aprsp" || query=="?Aprsp") {
-    processedQuery = "iGate QTH: " + String(currentWiFi->latitude) + " " + String(currentWiFi->longitude);
-  } else if (query=="?APRSL" || query=="?aprsl" || query=="?Aprsl") {
-    for (int i=0; i<lastHeardStation.size(); i++) {
-      processedQuery += lastHeardStation[i].substring(0,lastHeardStation[i].indexOf(",")) + " ";
-    }
-    processedQuery.trim();
-  } /*else if (query.indexOf("?APRSH") == 0 || query.indexOf("?aprsv") == 0 || query.indexOf("?Aprsv") == 0) {
-     // sacar callsign despues de ?APRSH
-    Serial.println("escuchaste a X estacion? en las ultimas 24 o 8 horas?");
-    processedQuery = "APRSH";
-  } else if (query.indexOf("?WHERE") == 0) { 
-    // agregar callsign para completar donde esta X callsign
-    Serial.println("estaciones escuchadas directo (ultimos 30 min)");
-    processedQuery = "WHERE";
-  }
-  for(int i = station.length(); i < 9; i++) {
-    station += ' ';
-  }
-  if (queryOrigin == "APRSIS") {
-    queryAnswer = Config.callsign + ">APLR10,TCPIP,qAC::" + station + ":" + processedQuery + "\n";
-  } else if (queryOrigin == "LoRa") {
-    queryAnswer = Config.callsign + ">APLR10,RFONLY::" + station + ":" + processedQuery;
-  }
-  return queryAnswer;
-}*/
-
 void checkReceivedPacket(String packet) {
   bool queryMessage = false;
   String aprsPacket, Sender, AddresseeAndMessage, Addressee, ackMessage, receivedMessage;
@@ -94,7 +61,7 @@ void checkReceivedPacket(String packet) {
               for(int i = Sender.length(); i < 9; i++) {
                 Sender += ' ';
               }
-              LoRaUtils::sendNewPacket("APRS", Config.callsign + ">APLR10,RFONLY::" + Sender + ":" + ackMessage);
+              LoRaUtils::sendNewPacket("APRS", Config.callsign + ">APLRG1,RFONLY::" + Sender + ":" + ackMessage);
               receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
             } else {
               receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
@@ -240,7 +207,7 @@ void loop() {
               for(int i = Sender.length(); i < 9; i++) {
                 Sender += ' ';
               }
-              String ackPacket = Config.callsign + ">APLR10,TCPIP,qAC::" + Sender + ":" + ackMessage + "\n";
+              String ackPacket = Config.callsign + ">APLRG1,TCPIP,qAC::" + Sender + ":" + ackMessage + "\n";
               espClient.write(ackPacket.c_str());
               receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
             } else {
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index 2ae8246..49c737e 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -74,7 +74,7 @@ String processLongitudeAPRS() {
 String generateBeacon() {
   String iGateLat = processLatitudeAPRS();
   String iGateLon = processLongitudeAPRS();
-  String beaconPacket = Config.callsign + ">APLR10,qAC:=";
+  String beaconPacket = Config.callsign + ">APLRG1,qAC:=";
   if (Config.loramodule.enableTx) {
     beaconPacket += iGateLat + "L" + iGateLon + "a";
   } else {
diff --git a/src/query_utils.cpp b/src/query_utils.cpp
index 365d649..96f70c2 100644
--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -34,9 +34,9 @@ String process(String query, String station, String queryOrigin) {
     station += ' ';
   }
   if (queryOrigin == "APRSIS") {
-    return Config.callsign + ">APLR10,TCPIP,qAC::" + station + ":" + answer + "\n";
+    return Config.callsign + ">APLRG1,TCPIP,qAC::" + station + ":" + answer + "\n";
   } else { //} if (queryOrigin == "LoRa") {
-    return Config.callsign + ">APLR10,RFONLY::" + station + ":" + answer;
+    return Config.callsign + ">APLRG1,RFONLY::" + station + ":" + answer;
   }
 }
 
diff --git a/src/utils.cpp b/src/utils.cpp
index 16be5d1..f631a8c 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -11,7 +11,7 @@ namespace utils {
 
 void processStatus() {
     delay(1000);
-    String startupStatus = Config.callsign + ">APLR10,qAC:>" + Config.defaultStatus;
+    String startupStatus = Config.callsign + ">APLRG1,qAC:>" + Config.defaultStatus;
     espClient.write((startupStatus + "\n").c_str()); 
     statusAfterBoot = false;
 }