From ec409a0b1833d7e741c1381afd449a9daaa4c162 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Tue, 6 Jun 2023 14:37:47 -0400
Subject: [PATCH] validate stations heard

---
 src/LoRa_APRS_iGate.cpp | 14 ++------------
 src/lora_utils.cpp      |  8 ++++++++
 src/lora_utils.h        |  1 +
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index d14aa24..b5b4eb9 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -152,15 +152,6 @@ void checkReceivedPacket(String packet) {
   }
 }
 
-String processAPRSISPacket(String aprsisMessage) {
-  String firstPart, messagePart, newLoraPacket;
-  aprsisMessage.trim();
-  firstPart = aprsisMessage.substring(0, aprsisMessage.indexOf(","));
-  messagePart = aprsisMessage.substring(aprsisMessage.indexOf("::")+2);
-  newLoraPacket = firstPart + ",TCPIP," + Config.callsign + "::" + messagePart;
-  return newLoraPacket;
-}
-
 void setup() {
   Serial.begin(115200);
   delay(1000);
@@ -243,7 +234,7 @@ void loop() {
     }
     
     if (espClient.available()) {
-      String aprsisData, aprsisPacket, newLoraPacket, Sender, AddresseeAndMessage, Addressee, receivedMessage;
+      String aprsisData, aprsisPacket, Sender, AddresseeAndMessage, Addressee, receivedMessage;
       bool validHeardStation = false;
       aprsisData = espClient.readStringUntil('\r'); // or '\n'
       aprsisPacket.concat(aprsisData);
@@ -283,8 +274,7 @@ void loop() {
           } else {
             Serial.print("Received from APRS-IS  : " + aprsisPacket);
             if (STATION_Utils::wasHeard(Addressee)) {
-              newLoraPacket = processAPRSISPacket(aprsisPacket);
-              LoRaUtils::sendNewPacket("APRS", newLoraPacket);
+              LoRaUtils::sendNewPacket("APRS", LoRaUtils::generatePacket(aprsisPacket));
               display_toggle(true);
               lastRxTxTime = millis();
               receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp
index 054003d..8aed5cd 100644
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -39,6 +39,14 @@ void sendNewPacket(const String &typeOfMessage, const String &newPacket) {
   Serial.println(newPacket);
 }
 
+String generatePacket(String aprsisPacket) {
+  String firstPart, messagePart;
+  aprsisPacket.trim();
+  firstPart = aprsisPacket.substring(0, aprsisPacket.indexOf(","));
+  messagePart = aprsisPacket.substring(aprsisPacket.indexOf("::")+2);
+  return firstPart + ",TCPIP," + Config.callsign + "::" + messagePart;
+}
+
 /*String receivePacket() {
   String loraPacket;
   int packetSize = LoRa.parsePacket();  // Listening for LoRa Packets
diff --git a/src/lora_utils.h b/src/lora_utils.h
index 745f828..4995b57 100644
--- a/src/lora_utils.h
+++ b/src/lora_utils.h
@@ -5,6 +5,7 @@ namespace LoRaUtils {
 
 void setup();
 void sendNewPacket(const String &typeOfMessage, const String &newPacket);
+String generatePacket(String aprsisPacket);
 //String receivePacket();
 
 }