From 1a042b7d0e1f60817efdd38e0fb4c30b17e20262 Mon Sep 17 00:00:00 2001
From: Ricardo Guzman <richon2001@hotmail.com>
Date: Tue, 14 Jul 2026 00:17:56 -0400
Subject: [PATCH] blockeando leafet 1

---
 data_embed/index.html   | 21 +++++++++++++++++++--
 src/LoRa_APRS_iGate.cpp |  2 +-
 src/configuration.cpp   | 17 ++++++++++-------
 src/gps_utils.cpp       | 10 ++++++++++
 src/lora_utils.cpp      | 11 ++++++++++-
 src/syslog_utils.cpp    |  6 +++++-
 6 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/data_embed/index.html b/data_embed/index.html
index e159f4b..b2232fe 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -7,7 +7,6 @@
         <title>LoRa iGate & Digi software &minus; Ricardo Guzman CA2RXU</title>
         <link rel="stylesheet" href="/bootstrap.css" />
         <link rel="stylesheet" href="/style.css" />
-        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
         <link rel="icon" href="/favicon.png" type="image/x-icon">
     <script>(function(){try{var t=localStorage.getItem("igateTheme");if(!t)t=window.matchMedia&&window.matchMedia("(prefers-color-scheme: light)").matches?"light":"dark";var r=document.documentElement;if(t==="night"){r.setAttribute("data-bs-theme","dark");r.setAttribute("data-variant","night");}else{r.setAttribute("data-bs-theme",t);}}catch(e){}})();</script>
 <style>
@@ -2386,7 +2385,25 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
         </div>
     </body>
     <script src="/bootstrap.js"></script>
-    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
+    <script>
+    // Leaflet se carga desde un CDN externo (internet). En modo AP la IP es siempre 192.168.4.1
+    // y NO hay internet, asi que los tags externos bloqueaban la carga de toda la pagina.
+    // Solucion: cargar Leaflet dinamicamente solo cuando NO estamos en modo AP.
+    (function () {
+        if (location.hostname === "192.168.4.1") return;   // modo AP: no cargar Leaflet
+        var css = document.createElement("link");
+        css.rel = "stylesheet";
+        css.href = "https://unpkg.com/leaflet@1.9.4/dist/leaflet.css";
+        css.integrity = "sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=";
+        css.crossOrigin = "";
+        document.head.appendChild(css);
+        var js = document.createElement("script");
+        js.src = "https://unpkg.com/leaflet@1.9.4/dist/leaflet.js";
+        js.integrity = "sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=";
+        js.crossOrigin = "";
+        document.head.appendChild(js);
+    })();
+    </script>
     <script src="/script.js"></script>
 </html>
 <script>
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 3277ed3..bcf69c3 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -68,7 +68,7 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-07-06";
+String              versionDate             = "2026-07-13";
 String              versionNumber           = "4.0.0";
 Configuration       Config;
 WiFiClient          aprsIsClient;
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7ead2da..a6ed87f 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -570,14 +570,17 @@ void Configuration::setDefaultValues() {
 
 void Configuration::setup() {
     if (!SPIFFS.begin(false)) {
-        Serial.println("SPIFFS Mount Failed");
-        return;
-    } else {
-        Serial.println("SPIFFS Mounted");
-    }
+        Serial.println("SPIFFS Mount Failed, formatting...");
 
-    bool exists = SPIFFS.exists("/igate_conf.json");
-    if (!exists) {
+        if (!SPIFFS.begin(true)) {
+            Serial.println("SPIFFS Format Failed");
+            return;
+        }
+    }
+    Serial.println("SPIFFS Ready");
+
+    if (!SPIFFS.exists("/igate_conf.json")) {
+        Serial.println("Config not found, creating default...");
         setDefaultValues();
         writeFile();
         delay(1000);
diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index 49e6043..123ca98 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -185,6 +185,16 @@ namespace GPS_Utils {
         return " _ / _ / _ ";
     }
 
+    /*String getDistanceAndCommentFromMicE(const String& packet) {
+        int indexOfMicE1 = packet.indexOf(":`");
+        int indexOfMicE2 = packet.indexOf(":\'");
+
+        if (indexOfMicE1 > 10 || indexOfMicE2 > 10) {
+            return decodeEncodedGPS(packet);
+        }
+        return " _ / _ / _ ";
+    }*/
+
     void setup() {
         #ifdef HAS_GPS
             if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) {
diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp
index 27e320a..1f603be 100644
--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -69,6 +69,15 @@ float snr;
 
 namespace LoRa_Utils {
 
+    static String sanitizeForWeb(const String& s) {     // replaces non-printable ASCII with '.' for WebUI display
+        String out = s;
+        for (int i = 0; i < (int)out.length(); i++) {
+            uint8_t c = (uint8_t)out[i];
+            if (c < 32 || c == 127) out.setCharAt(i, '.');
+        }
+        return out;
+    }
+
     void setFlag(void) {
         operationDone = true;
     }
@@ -276,7 +285,7 @@ namespace LoRa_Utils {
                                 }
                                 ReceivedPacket receivedPacket;
                                 receivedPacket.rxTime   = NTP_Utils::getFormatedTime();
-                                receivedPacket.packet   = packet.substring(3);
+                                receivedPacket.packet   = sanitizeForWeb(packet.substring(3));
                                 receivedPacket.RSSI     = rssi;
                                 receivedPacket.SNR      = snr;
                                 receivedPackets.push_back(receivedPacket);
diff --git a/src/syslog_utils.cpp b/src/syslog_utils.cpp
index 525ff35..b8fcde3 100644
--- a/src/syslog_utils.cpp
+++ b/src/syslog_utils.cpp
@@ -79,11 +79,15 @@ namespace SYSLOG_Utils {
                         syslogPacket.concat(sender);
                         syslogPacket.concat(" ---> ");
                         syslogPacket.concat(packet.substring(colonIndex + 2));
-                    } else if (nextChar == '`') {
+                    } else if (nextChar == '`' || nextChar == '\'') {     // both Mic-E DTIs are valid
                         syslogPacket.concat("MIC-E / ");
                         syslogPacket.concat(sender);
                         syslogPacket.concat(" ---> ");
+                        syslogPacket.concat(String(nextChar));  // restore the actual indicator received
                         syslogPacket.concat(packet.substring(colonIndex + 2));
+                        // append distance for Mic-E, same as the GPS path
+                        //syslogPacket.concat(" / ");
+                        //syslogPacket.concat(GPS_Utils::getDistanceAndComment(packet));
                     } else if (nextChar == ';') {
                         syslogPacket.concat("OBJECT / ");
                         syslogPacket.concat(sender);