From d19284df123f58afd1bbe83b8215fa2e5a1070b6 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Mon, 20 May 2024 23:03:57 -0400
Subject: [PATCH] Objects received

---
 data_embed/index.html   |  48 ++++++------------
 data_embed/script.js    | 110 ++++++++++++++++++----------------------
 src/LoRa_APRS_iGate.cpp |   2 +-
 src/aprs_is_utils.cpp   |  12 +++--
 src/configuration.cpp   |  10 ++--
 src/configuration.h     |   2 +-
 src/web_utils.cpp       |   2 +-
 7 files changed, 79 insertions(+), 107 deletions(-)

diff --git a/data_embed/index.html b/data_embed/index.html
index fdb2bef..0e9600e 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -456,38 +456,6 @@
                                             >
                                         </div>
                                     </div>
-                                    <div class="col-6">
-                                        <div class="form-check form-switch">
-                                            <input
-                                                type="checkbox"
-                                                name="aprs_is.toRF"
-                                                id="aprs_is.toRF"
-                                                class="form-check-input"
-                                            />
-                                            <label
-                                                for="aprs_is.toRF"
-                                                class="form-label"
-                                                >Gate APRS-IS traffic to
-                                                RF</label
-                                            >
-                                        </div>
-                                    </div>
-                                    <div class="col-6">
-                                        <div class="form-check form-switch">
-                                            <input
-                                                type="checkbox"
-                                                name="beacon.sendViaAPRSIS"
-                                                id="beacon.sendViaAPRSIS"
-                                                class="form-check-input"
-                                            />
-                                            <label
-                                                for="beacon.sendViaAPRSIS"
-                                                class="form-label"
-                                                >Send our beacon to
-                                                APRS-IS</label
-                                            >
-                                        </div>
-                                    </div>
                                     <div class="col-8">
                                         <label
                                             for="aprs_is.server"
@@ -939,6 +907,22 @@
                             </div>
                             <div class="col-lg-9 col-sm-12">
                                 <div class="row">
+                                    <div class="col-6">
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="beacon.sendViaAPRSIS"
+                                                id="beacon.sendViaAPRSIS"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="beacon.sendViaAPRSIS"
+                                                class="form-label"
+                                                >Send our beacon to
+                                                APRS-IS</label
+                                            >
+                                        </div>
+                                    </div>
                                     <div class="col-6">
                                         <div class="form-check form-switch">
                                             <input
diff --git a/data_embed/script.js b/data_embed/script.js
index 814dec6..83d6313 100644
--- a/data_embed/script.js
+++ b/data_embed/script.js
@@ -74,19 +74,19 @@ logCheckbox.addEventListener("change", function () {
 function loadSettings(settings) {
     currentSettings = settings;
     // General
-    document.getElementById("callsign").value = settings.callsign;
+    document.getElementById("callsign").value               = settings.callsign;
     // document.getElementById("stationMode").value = settings.stationMode;
-    document.getElementById("bme.active").checked = settings.bme.active;
-    document.getElementById("bme.heightCorrection").value = settings.bme.heightCorrection;
-    document.getElementById("bme.temperatureCorrection").value = settings.bme.temperatureCorrection.toFixed(1);
+    document.getElementById("bme.active").checked           = settings.bme.active;
+    document.getElementById("bme.heightCorrection").value   = settings.bme.heightCorrection;
+    document.getElementById("bme.temperatureCorrection").value  = settings.bme.temperatureCorrection.toFixed(1);
     
-    document.getElementById("beacon.comment").value = settings.beacon.comment;
-    document.getElementById("beacon.symbol").value = settings.beacon.symbol;
-    document.getElementById("beacon.overlay").value = settings.beacon.overlay;
+    document.getElementById("beacon.comment").value         = settings.beacon.comment;
+    document.getElementById("beacon.symbol").value          = settings.beacon.symbol;
+    document.getElementById("beacon.overlay").value         = settings.beacon.overlay;
 
-    document.getElementById("action.symbol").value = settings.beacon.overlay + settings.beacon.symbol;
+    document.getElementById("action.symbol").value          = settings.beacon.overlay + settings.beacon.symbol;
 
-    document.querySelector(".list-networks").innerHTML = "";
+    document.querySelector(".list-networks").innerHTML      = "";
 
     // Networks
     const wifiNetworks = settings.wifi.AP || [];
@@ -122,76 +122,65 @@ function loadSettings(settings) {
     });
 
     // APRS-IS
-    document.getElementById("aprs_is.active").checked = settings.aprs_is.active;
-    document.getElementById("aprs_is.toRF").checked = settings.aprs_is.toRF;
-    document.getElementById("aprs_is.server").value = settings.aprs_is.server;
-    document.getElementById("aprs_is.port").value = settings.aprs_is.port;
-    document.getElementById("aprs_is.filter").value = settings.aprs_is.filter;
-    document.getElementById("aprs_is.passcode").value =
-        settings.aprs_is.passcode;
+    document.getElementById("aprs_is.active").checked       = settings.aprs_is.active;
+    document.getElementById("aprs_is.messagesToRF").checked = settings.aprs_is.messagesToRF;
+    document.getElementById("aprs_is.objectsToRF").checked  = settings.aprs_is.objectsToRF;
+    //document.getElementById("aprs_is.toRF").checked         = settings.aprs_is.toRF;
+    document.getElementById("aprs_is.server").value         = settings.aprs_is.server;
+    document.getElementById("aprs_is.port").value           = settings.aprs_is.port;
+    document.getElementById("aprs_is.filter").value         = settings.aprs_is.filter;
+    document.getElementById("aprs_is.passcode").value       = settings.aprs_is.passcode;
 
     // Display
-    document.getElementById("display.alwaysOn").checked =
-        settings.display.alwaysOn;
-    document.getElementById("display.turn180").checked =
-        settings.display.turn180;
-    document.getElementById("display.timeout").value = settings.display.timeout;
+    document.getElementById("display.alwaysOn").checked     = settings.display.alwaysOn;
+    document.getElementById("display.turn180").checked      = settings.display.turn180;
+    document.getElementById("display.timeout").value        = settings.display.timeout;
 
     if (settings.display.alwaysOn) {
         timeoutInput.disabled = true;
     }
 
     // WiFi Auto AP
-    document.getElementById("wifi.autoAP.password").value =
-        settings.wifi.autoAP.password;
-    document.getElementById("wifi.autoAP.powerOff").value =
-        settings.wifi.autoAP.powerOff;
+    document.getElementById("wifi.autoAP.password").value   = settings.wifi.autoAP.password;
+    document.getElementById("wifi.autoAP.powerOff").value   = settings.wifi.autoAP.powerOff;
 
     // Digi
     // document.getElementById("digi.comment").value = settings.digi.comment;
     // document.getElementById("digi.latitude").value = settings.digi.latitude;
     // document.getElementById("digi.longitude").value = settings.digi.longitude;
-    document.getElementById("digi.mode").value = settings.digi.mode;
+    document.getElementById("digi.mode").value              = settings.digi.mode;
 
     // TNC
     if (settings.tnc) {
         document.getElementById("tnc.enableServer").checked = settings.tnc.enableServer;
         document.getElementById("tnc.enableSerial").checked = settings.tnc.enableSerial;
-        document.getElementById("tnc.acceptOwn").checked = settings.tnc.acceptOwn;
+        document.getElementById("tnc.acceptOwn").checked    = settings.tnc.acceptOwn;
     }
 
     // OTA
-    document.getElementById("ota.username").value = settings.ota.username;
-    document.getElementById("ota.password").value = settings.ota.password;
+    document.getElementById("ota.username").value           = settings.ota.username;
+    document.getElementById("ota.password").value           = settings.ota.password;
 
     // Beacon
-    document.getElementById("beacon.interval").value = settings.beacon.interval;
-    document.getElementById("other.rememberStationTime").value =
-        settings.other.rememberStationTime;
-    document.getElementById("other.sendBatteryVoltage").checked =
-        settings.other.sendBatteryVoltage;
-    document.getElementById("other.externalVoltageMeasurement").checked =
-        settings.other.externalVoltageMeasurement;
-
-    document.getElementById("other.externalVoltagePin").value =
-        settings.other.externalVoltagePin;
+    document.getElementById("beacon.interval").value        = settings.beacon.interval;
+    document.getElementById("other.rememberStationTime").value  = settings.other.rememberStationTime;
+    document.getElementById("other.sendBatteryVoltage").checked = settings.other.sendBatteryVoltage;
+    document.getElementById("other.externalVoltageMeasurement").checked = settings.other.externalVoltageMeasurement;
+    document.getElementById("other.externalVoltagePin").value   = settings.other.externalVoltagePin;
     // document.getElementById("beacon.igateSendsLoRaBeacon").value =
     //     settings.beacon.igateSendsLoRaBeacon;
     // document.getElementById("beacon.igateRepeatLoRaPackets").value =
     //     settings.beacon.igateRepeatLoRaPackets;
-    document.getElementById("beacon.path").value = settings.beacon.path;
-    document.getElementById("beacon.latitude").value = settings.beacon.latitude;
-    document.getElementById("beacon.longitude").value =
-        settings.beacon.longitude;
-    document.getElementById("beacon.sendViaAPRSIS").checked =
-        settings.beacon.sendViaAPRSIS;
-    document.getElementById("beacon.sendViaRF").checked =
-        settings.beacon.sendViaRF;
+    document.getElementById("beacon.path").value            = settings.beacon.path;
+    document.getElementById("beacon.latitude").value        = settings.beacon.latitude;
+    document.getElementById("beacon.longitude").value       = settings.beacon.longitude;
+    document.getElementById("beacon.sendViaAPRSIS").checked = settings.beacon.sendViaAPRSIS;
+    document.getElementById("beacon.sendViaRF").checked     = settings.beacon.sendViaRF;
 
     // Syslog
-    document.getElementById("syslog.active").checked = settings.syslog.active;
-    document.getElementById("syslog.server").value = settings.syslog.server;
-    document.getElementById("syslog.port").value = settings.syslog.port;
+    document.getElementById("syslog.active").checked        = settings.syslog.active;
+    document.getElementById("syslog.server").value          = settings.syslog.server;
+    document.getElementById("syslog.port").value            = settings.syslog.port;
 
     if (settings.syslog.active) {
         serverField.disabled = false;
@@ -204,20 +193,17 @@ function loadSettings(settings) {
     // document.getElementById("lora.iGateFreq").value = settings.lora.iGateFreq;
     // document.getElementById("lora.digirepeaterRxFreq").value =
     //     settings.lora.digirepeaterRxFreq;
-    document.getElementById("lora.txFreq").value = settings.lora.txFreq;
-    document.getElementById("lora.rxFreq").value = settings.lora.rxFreq;
-    document.getElementById("lora.txActive").checked = settings.lora.txActive;
-    document.getElementById("lora.rxActive").checked = settings.lora.rxActive;
-    document.getElementById("lora.spreadingFactor").value =
-        settings.lora.spreadingFactor;
-    document.getElementById("lora.signalBandwidth").value =
-        settings.lora.signalBandwidth;
-    document.getElementById("lora.codingRate4").value =
-        settings.lora.codingRate4;
-    document.getElementById("lora.power").value = settings.lora.power;
+    document.getElementById("lora.txFreq").value            = settings.lora.txFreq;
+    document.getElementById("lora.rxFreq").value            = settings.lora.rxFreq;
+    document.getElementById("lora.txActive").checked        = settings.lora.txActive;
+    document.getElementById("lora.rxActive").checked        = settings.lora.rxActive;
+    document.getElementById("lora.spreadingFactor").value   = settings.lora.spreadingFactor;
+    document.getElementById("lora.signalBandwidth").value   = settings.lora.signalBandwidth;
+    document.getElementById("lora.codingRate4").value       = settings.lora.codingRate4;
+    document.getElementById("lora.power").value             = settings.lora.power;
 
     // Experimental
-    document.getElementById("other.lowPowerMode").checked = settings.other.lowPowerMode;
+    document.getElementById("other.lowPowerMode").checked   = settings.other.lowPowerMode;
     document.getElementById("other.lowVoltageCutOff").value = settings.other.lowVoltageCutOff || 0
 
     updateImage();
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index e5198c4..ef5ae5d 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -37,7 +37,7 @@ ________________________________________________________________________________
     #include "A7670_utils.h"
 #endif
 
-String          versionDate             = "2024.05.17";
+String          versionDate             = "2024.05.20";
 Configuration   Config;
 WiFiClient      espClient;
 uint8_t         myWiFiAPIndex           = 0;
diff --git a/src/aprs_is_utils.cpp b/src/aprs_is_utils.cpp
index f7c1b2a..a2d71e6 100644
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -240,9 +240,9 @@ namespace APRS_IS_Utils {
                         seventhLine = "QUERY = " + receivedMessage;
                     }
                 } else {
-                    Utils::print("Received from APRS-IS  : " + packet);
+                    Utils::print("Received Message from APRS-IS  : " + packet);
 
-                    if (/*Config.aprs_is.toRF && */STATION_Utils::wasHeard(Addressee)) {
+                    if (STATION_Utils::wasHeard(Addressee)) {
                         STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet));
                         display_toggle(true);
                         lastScreenOn = millis();
@@ -251,7 +251,13 @@ namespace APRS_IS_Utils {
                 }
                 show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
             } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
-                Serial.print("Object : "); Serial.println(packet);
+                Utils::println("Received Object from APRS-IS  : " + packet);
+                //
+                // revisar que se enviara del output buffer!!!
+                //STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet));
+                display_toggle(true);
+                lastScreenOn = millis();
+                Utils::typeOfPacket(packet, 1); // APRS-LoRa
             } 
         }
     }
diff --git a/src/configuration.cpp b/src/configuration.cpp
index a65e921..a42b3a3 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -58,7 +58,7 @@ void Configuration::writeFile() {
     data["aprs_is"]["server"] = aprs_is.server;
     data["aprs_is"]["port"] = aprs_is.port;
     data["aprs_is"]["filter"] = aprs_is.filter;
-    data["aprs_is"]["toRF"] = aprs_is.toRF;
+    //data["aprs_is"]["toRF"] = aprs_is.toRF;
     data["aprs_is"]["messagesToRF"] = aprs_is.messagesToRF;
     data["aprs_is"]["objectsToRF"] = aprs_is.objectsToRF;
     
@@ -195,9 +195,7 @@ bool Configuration::readFile() {
 
             aprs_is.active                    = data["aprs_is"]["active"].as<bool>();
             aprs_is.filter                    = data["aprs_is"]["filter"].as<String>();
-            //
-            aprs_is.toRF                      = data["aprs_is"]["toRF"].as<bool>();
-            //
+            //aprs_is.toRF                      = data["aprs_is"]["toRF"].as<bool>();
             aprs_is.messagesToRF              = data["aprs_is"]["messagesToRF"].as<bool>();
             aprs_is.objectsToRF               = data["aprs_is"]["objectsToRF"].as<bool>();
 
@@ -314,9 +312,7 @@ void Configuration::init() {
     aprs_is.server              = "rotate.aprs2.net";
     aprs_is.port                = 14580;
     aprs_is.filter              = "m/10"; // new
-    //
-    aprs_is.toRF                = false; // new
-    //
+    //aprs_is.toRF                = false; // new
     aprs_is.messagesToRF        = false;
     aprs_is.objectsToRF         = false;
 
diff --git a/src/configuration.h b/src/configuration.h
index 58494f3..a8708a2 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -48,7 +48,7 @@ public:
     int     port;
     // int     reportingDistance; // deprecated
     String  filter; // new
-    bool    toRF; // new
+    //bool    toRF; // new
     bool    messagesToRF;
     bool    objectsToRF;
 };
diff --git a/src/web_utils.cpp b/src/web_utils.cpp
index cc73cef..2b1227d 100644
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -115,7 +115,7 @@ namespace WEB_Utils {
         Config.aprs_is.port             = request->getParam("aprs_is.port", true)->value().toInt();
         // Config.aprs_is.reportingDistance = request->getParam("aprs_is.reportingDistance", true)->value().toInt();
         Config.aprs_is.filter           = request->getParam("aprs_is.filter", true)->value();
-        Config.aprs_is.toRF             = request->hasParam("aprs_is.toRF", true);
+        //Config.aprs_is.toRF             = request->hasParam("aprs_is.toRF", true);
         Config.aprs_is.messagesToRF     = request->hasParam("aprs_is.messagesToRF", true);
         Config.aprs_is.objectsToRF      = request->hasParam("aprs_is.objectsToRF", true);