From 8be573e2b606c1f400c459214c90857e5e5073d4 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Tue, 21 May 2024 00:00:23 -0400
Subject: [PATCH] new buildPacketToTx

---
 src/aprs_is_utils.cpp | 41 +++++++++++++++++++++++++++++++++--------
 src/aprs_is_utils.h   |  2 +-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp
index a2d71e6..d95204c 100644
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -107,12 +107,39 @@ namespace APRS_IS_Utils {
         }
     }
 
-    String buildPacketToTx(const String& aprsisPacket) {
+    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
         String packet = aprsisPacket;
         packet.trim();
-        String firstPart = packet.substring(0, packet.indexOf(","));
-        String messagePart = packet.substring(packet.indexOf("::") + 2);
-        return firstPart + ",TCPIP,WIDE1-1," + Config.callsign + "::" + messagePart;
+        String outputPacket = packet.substring(0, packet.indexOf(",")) + ",TCPIP,WIDE1-1," + Config.callsign;
+        switch (packetType) {
+            case 0: // gps
+                if (packet.indexOf(":=") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":="));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":!"));
+                }
+                break;
+            case 1: // messages
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 2: // status
+                outputPacket += packet.substring(packet.indexOf(":>"));
+                break;
+            case 3: // telemetry
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 4: // mic-e
+                if (packet.indexOf(":`") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":`"));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":'"));
+                }
+                break;
+            case 5: // object
+                outputPacket += packet.substring(packet.indexOf(":;"));
+                break;
+        }
+        return outputPacket;
     }
 
     bool processReceivedLoRaMessage(const String& sender, const String& packet) {
@@ -243,7 +270,7 @@ namespace APRS_IS_Utils {
                     Utils::print("Received Message from APRS-IS  : " + packet);
 
                     if (STATION_Utils::wasHeard(Addressee)) {
-                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet));
+                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
                         display_toggle(true);
                         lastScreenOn = millis();
                         Utils::typeOfPacket(packet, 1); // APRS-LoRa
@@ -252,9 +279,7 @@ namespace APRS_IS_Utils {
                 show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
             } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
                 Utils::println("Received Object from APRS-IS  : " + packet);
-                //
-                // revisar que se enviara del output buffer!!!
-                //STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet));
+                STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
                 display_toggle(true);
                 lastScreenOn = millis();
                 Utils::typeOfPacket(packet, 1); // APRS-LoRa
diff --git a/src/aprs_is_utils.h b/src/aprs_is_utils.h
index 4942493..8dde4b3 100644
--- a/src/aprs_is_utils.h
+++ b/src/aprs_is_utils.h
@@ -10,7 +10,7 @@ namespace APRS_IS_Utils {
     void connect();
     void checkStatus();
     String buildPacketToUpload(const String& packet);
-    String buildPacketToTx(const String& aprsisPacket);
+    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
     bool processReceivedLoRaMessage(const String& sender, const String& packet);
     void processLoRaPacket(const String& packet);
     void processAPRSISPacket(const String& packet);