tnc2 added

display: fix SCREEN_HEIGHT definition and maxLines for SH1106 OLED

.vscode/extensions.json

@@ -5,6 +5,7 @@
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
+        "ms-vscode.cpptools-extension-pack",
+        "pioarduino.pioarduino-ide"
     ]
 }

data_embed/index.html

@@ -1520,7 +1520,7 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                             <label
                                                 for="tnc.enableSerial"
                                                 class="form-label"
-                                                >Enable Serial KISS</label
+                                                >Enable Serial</label
                                             >
                                         </div>
                                     </div>
@@ -1552,7 +1552,7 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                             <label
                                                 for="tnc.acceptOwn"
                                                 class="form-label"
-                                                >Accept own frames via KISS</label
+                                                >Accept own frames</label
                                             >
                                         </div>
                                     </div>
@@ -1572,6 +1572,23 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                         </div>
                                     </div>
                                 </div>
+                                <div class="row mt-2">
+                                    <div class="col-6">
+                                        <label
+                                            for="tnc.kissProtocol"
+                                            class="form-label"
+                                            >Protocol</label
+                                        >
+                                        <select
+                                            class="form-select form-select"
+                                            name="tnc.kissProtocol"
+                                            id="tnc.kissProtocol"
+                                        >
+                                            <option value="KISS" selected>KISS</option>
+                                            <option value="TNC2">TNC2</option>
+                                        </select>
+                                    </div>
+                                </div>
                             </div>
                         </div>
 

data_embed/script.js

@@ -226,6 +226,7 @@ function loadSettings(settings) {
         document.getElementById("tnc.enableSerial").checked             = settings.tnc.enableSerial;
         document.getElementById("tnc.acceptOwn").checked                = settings.tnc.acceptOwn;
         document.getElementById("tnc.aprsBridgeActive").checked         = settings.tnc.aprsBridgeActive;
+        document.getElementById("tnc.kissProtocol").value                = settings.tnc.kissProtocol ? "KISS" : "TNC2";
     }
 
     // MQTT
@@ -668,9 +669,9 @@ function setMapMessage(text) {
  *   "L&"  Alternate table with overlay
  *
  * Sprite layout:
- *   aprs-symbols-48-0.png = Primary table
- *   aprs-symbols-48-1.png = Alternate table
- *   aprs-symbols-48-2.png = Overlay characters
+ *   aprs-symbols-24-0.png = Primary table
+ *   aprs-symbols-24-1.png = Alternate table
+ *   aprs-symbols-24-2.png = Overlay characters
  */
 
 function getAprsSymbolIcon(symbol, callsign = "") {
@@ -717,8 +718,7 @@ function getAprsSymbolIcon(symbol, callsign = "") {
 
     /*
      * Sprite sheet contains 16 columns x 6 rows.
-     * Each cell occupies 24x24 CSS px, but the underlying PNG assets are
-     * actually 48x48 px/cell (2x) for sharpness on high-DPI screens; the
+     * Each cell occupies 24x24 CSS px; the
      * "background-size" below tells the browser to scale the sheet back
      * down to its original 24px-per-cell layout, so all position math
      * stays in 24px units regardless of source resolution.
@@ -731,8 +731,8 @@ function getAprsSymbolIcon(symbol, callsign = "") {
 
     const sprite =
         table === "/"
-            ? "/aprs-symbols-48-0.png"
-            : "/aprs-symbols-48-1.png";
+            ? "/aprs-symbols-24-0.png"
+            : "/aprs-symbols-24-1.png";
 
     const x = -(col * 24);
     const y = -(row * 24);
@@ -792,7 +792,7 @@ function getAprsSymbolIcon(symbol, callsign = "") {
                     top:0;
                     width:24px;
                     height:24px;
-                    background-image:url('/aprs-symbols-48-2.png');
+                    background-image:url('/aprs-symbols-24-2.png');
                     background-repeat:no-repeat;
                     background-position:${ox}px ${oy}px;
                     background-size:${sheetSize};
@@ -865,11 +865,17 @@ function getUsedDigipeaters(path) {
 function describeMapPath(station) {
     const digis = getUsedDigipeaters(station.path);
 
-    if (!digis.length) {
-        return "Direct";
+    // heardDirect viene del firmware: true si ALGUNA VEZ se oyo directo,
+    // aunque el ultimo paquete haya llegado repetido.
+    if (station.heardDirect && digis.length) {
+        return "Direct+Via: " + digis.join(" → ");
     }
 
-    return "Via: " + digis.join(" → ");
+    if (digis.length) {
+        return "Via: " + digis.join(" → ");
+    }
+
+    return "Direct";
 }
 
 
@@ -904,8 +910,10 @@ function drawStationRoute(station) {
 
     points.push(iGateLatLng);
 
+    const routeColor = digis.length > 0 ? "#2e7d32" : "#1565c0";
+
     mapRouteLayer = L.polyline(points, {
-        color: "#e53935",
+        color: routeColor,
         weight: 3,
         opacity: 0.9
     }).addTo(mapInstance);

include/configuration.h

@@ -132,6 +132,7 @@ public:
     bool    enableSerial;
     bool    acceptOwn;
     bool    aprsBridgeActive;
+    bool    kissProtocol;    // true = KISS, false = TNC2 -- applies to both Serial and TCP server
 };
 
 class OTA {

include/map_utils.h

@@ -34,6 +34,7 @@ struct MapStation {
     char     lastHeard[10];     // "HH:MM:SS" si hay NTP valido, "" si no
     char     path[96];          // last path received
     uint32_t lastHeardMillis;   // millis() -> ordenar / expirar (no se muestra)
+    bool     heardDirect;       // true si ALGUNA VEZ se oyo sin digipeaters (no se resetea)
 };
 
 namespace MAP_Utils {

platformio.ini

@@ -29,9 +29,9 @@ board_build.embed_files =
 	data_embed/leaflet.css.gz
 	data_embed/leaflet.js.gz
 	data_embed/favicon.png.gz
-    data_embed/aprs-symbols-48-0.png.gz
-    data_embed/aprs-symbols-48-1.png.gz
-    data_embed/aprs-symbols-48-2.png.gz
+    data_embed/aprs-symbols-24-0.png.gz
+    data_embed/aprs-symbols-24-1.png.gz
+    data_embed/aprs-symbols-24-2.png.gz
 extra_scripts =
 	pre:tools/compress.py
 debug_tool = esp-prog

src/LoRa_APRS_iGate.cpp

@@ -68,7 +68,7 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-08-25";
+String              versionDate             = "2026-09-15";
 String              versionNumber           = "4.0.1";
 Configuration       Config;
 WiFiClient          aprsIsClient;

src/configuration.cpp

@@ -157,6 +157,7 @@ bool Configuration::writeFile() {
         data["tnc"]["enableSerial"]                 = tnc.enableSerial;
         data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
         data["tnc"]["aprsBridgeActive"]             = tnc.aprsBridgeActive;
+        data["tnc"]["kissProtocol"]                 = tnc.kissProtocol;
 
         data["mqtt"]["active"]                      = mqtt.active;
         data["mqtt"]["server"]                      = mqtt.server;
@@ -369,11 +370,13 @@ bool Configuration::readFile() {
         if (data["tnc"]["enableServer"].isNull() ||
             data["tnc"]["enableSerial"].isNull() ||
             data["tnc"]["acceptOwn"].isNull() ||
-            data["tnc"]["aprsBridgeActive"].isNull()) needsRewrite = true;
+            data["tnc"]["aprsBridgeActive"].isNull() ||
+            data["tnc"]["kissProtocol"].isNull()) needsRewrite = true;
         tnc.enableServer                = data["tnc"]["enableServer"] | false;
         tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
         tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;
         tnc.aprsBridgeActive            = data["tnc"]["aprsBridgeActive"] | false;
+        tnc.kissProtocol                = data["tnc"]["kissProtocol"] | true;
 
         if (data["mqtt"]["active"].isNull() ||
             data["mqtt"]["server"].isNull() ||
@@ -538,6 +541,7 @@ void Configuration::setDefaultValues() {
     tnc.enableSerial                = false;
     tnc.acceptOwn                   = false;
     tnc.aprsBridgeActive            = false;
+    tnc.kissProtocol                = true;
 
     mqtt.active                     = false;
     mqtt.server                     = "";

src/display.cpp

@@ -57,19 +57,20 @@
             String lastEpaperText;
         #else
             #include <Adafruit_GFX.h>
+            #if defined RPC_LORA_DIGIGATE_1W
+                #define SCREEN_HEIGHT 32
+            #else
+                #define SCREEN_HEIGHT 64
+            #endif
+
             #ifdef HAS_SH1106
                 #include <Adafruit_SH110X.h>
-                Adafruit_SH1106G display(128, 64, &Wire, OLED_RST);
+                Adafruit_SH1106G display(128, SCREEN_HEIGHT, &Wire, OLED_RST);
             #else
                 #include <Adafruit_SSD1306.h>
                 #ifdef HELTEC_WSL_V3_DISPLAY
-                    Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
+                    Adafruit_SSD1306 display(128, SCREEN_HEIGHT, &Wire1, OLED_RST);
                 #else
-                    #if defined RPC_LORA_DIGIGATE_1W
-                        #define SCREEN_HEIGHT 32
-                    #else
-                        #define SCREEN_HEIGHT 64
-                    #endif
                     Adafruit_SSD1306 display(128, SCREEN_HEIGHT, &Wire, OLED_RST);
                 #endif
             #endif
@@ -107,6 +108,8 @@ void displaySetup() {
                 maxLines = 6;
             #elif (SCREEN_HEIGHT == 32)
                 maxLines = 3;
+            #else
+                maxLines = 6;
             #endif
             #ifdef HAS_EPAPER
                 display.landscape();

src/map_utils.cpp

@@ -48,6 +48,7 @@ namespace MAP_Utils {
                 s.count++;
                 symbol.toCharArray(s.symbol, sizeof(s.symbol));
                 path.toCharArray(s.path, sizeof(s.path));
+                if (path.indexOf('*') == -1) s.heardDirect = true;   // se oyo directo alguna vez; no se resetea si despues llega repetido
                 writeFormatedTime(s.lastHeard, sizeof(s.lastHeard));
                 s.lastHeardMillis = millis();
                 return;
@@ -73,6 +74,7 @@ namespace MAP_Utils {
         st.rssi      = rssi;
         st.snr       = snr;
         st.count     = 1;
+        st.heardDirect = (path.indexOf('*') == -1);         // primer paquete: directo si no trae digis usados
         writeFormatedTime(st.lastHeard, sizeof(st.lastHeard));
         st.lastHeardMillis = millis();
         mapStations.push_back(st);
@@ -101,6 +103,7 @@ namespace MAP_Utils {
             data[i]["count"]     = mapStations[i].count;
             data[i]["lastHeard"] = mapStations[i].lastHeard;
             data[i]["path"]      = mapStations[i].path;
+            data[i]["heardDirect"] = mapStations[i].heardDirect;
         }
 
         String buffer;

src/tnc_utils.cpp

@@ -78,7 +78,23 @@ namespace TNC_Utils {
         }
     }
 
-    void handleInputData(char character, int bufferIndex) {
+    void processInputFrame(const String& frame, int bufferIndex, const String& protocolLabel) {
+        if (bufferIndex != -1) {
+            Utils::print("<--- Got from TNC (" + protocolLabel + ") : ");
+            Utils::println(frame);
+        }
+
+        String sender = frame.substring(0,frame.indexOf(">"));
+
+        if (Config.tnc.acceptOwn || sender != Config.callsign) {
+            if (Config.loramodule.txActive) STATION_Utils::addToOutputPacketBuffer(frame);
+            if (Config.tnc.aprsBridgeActive && Config.aprs_is.active && passcodeValid && aprsIsClient.connected()) APRS_IS_Utils::upload(frame);
+        } else {
+            Utils::println("Ignored own frame from " + protocolLabel);
+        }
+    }
+
+    void handleInputDataKISS(char character, int bufferIndex) {
         String* data = (bufferIndex == -1) ? &inputSerialBuffer : &inputServerBuffer[bufferIndex];
         if (data->length() == 0 && character != (char)FEND) return;
 
@@ -89,19 +105,7 @@ namespace TNC_Utils {
             const String& frame = decodeKISS(*data, isDataFrame);
 
             if (isDataFrame) {
-                if (bufferIndex != -1) {
-                    Utils::print("<--- Got from TNC      : ");
-                    Utils::println(frame);
-                }
-
-                String sender = frame.substring(0,frame.indexOf(">"));
-
-                if (Config.tnc.acceptOwn || sender != Config.callsign) {
-                    if (Config.loramodule.txActive) STATION_Utils::addToOutputPacketBuffer(frame);
-                    if (Config.tnc.aprsBridgeActive && Config.aprs_is.active && passcodeValid && aprsIsClient.connected()) APRS_IS_Utils::upload(frame);
-                } else {
-                    Utils::println("Ignored own frame from KISS");
-                }
+                processInputFrame(frame, bufferIndex, "KISS");
             }
             data->clear();
         }
@@ -111,6 +115,36 @@ namespace TNC_Utils {
         }
     }
 
+    void handleInputDataTNC2(char character, int bufferIndex) {
+        String* data = (bufferIndex == -1) ? &inputSerialBuffer : &inputServerBuffer[bufferIndex];
+
+        if (character == '\r') return;
+
+        if (character == '\n') {
+            String frame = *data;
+            frame.trim();
+            data->clear();
+
+            if (frame.length() > 0 && frame.indexOf(':') != -1 && frame.indexOf('>') != -1) {
+                processInputFrame(frame, bufferIndex, "TNC2");
+            }
+            return;
+        }
+
+        data->concat(character);
+        if (data->length() > 255) {
+            data->clear();
+        }
+    }
+
+    void handleInputData(char character, int bufferIndex) {
+        if (Config.tnc.kissProtocol) {
+            handleInputDataKISS(character, bufferIndex);
+        } else {
+            handleInputDataTNC2(character, bufferIndex);
+        }
+    }
+
     void readFromClients() {
         for (int i = 0; i < MAX_CLIENTS; i++) {
             auto client = clients[i];
@@ -138,13 +172,13 @@ namespace TNC_Utils {
     void sendToClients(const String& packet, bool stripBytes) {
         String cleanPacket = stripBytes ? packet.substring(3): packet;
 
-        const String kissEncoded = encodeKISS(cleanPacket);
+        const String encoded = Config.tnc.kissProtocol ? encodeKISS(cleanPacket) : (cleanPacket + "\r\n");
 
         for (int i = 0; i < MAX_CLIENTS; i++) {
             auto client = clients[i];
             if (client != nullptr) {
                 if (client->connected()) {
-                    client->print(kissEncoded);
+                    client->print(encoded);
                     client->flush();
                 } else {
                     delete client;
@@ -158,7 +192,7 @@ namespace TNC_Utils {
 
     void sendToSerial(const String& packet, bool stripBytes) {
         String cleanPacket = stripBytes ? packet.substring(3): packet;
-        Serial.print(encodeKISS(cleanPacket));
+        Serial.print(Config.tnc.kissProtocol ? encodeKISS(cleanPacket) : (cleanPacket + "\r\n"));
         Serial.flush();
     }
 

src/web_utils.cpp

@@ -62,17 +62,17 @@ extern const unsigned char favicon_data[] asm("_binary_data_embed_favicon_png_gz
 extern const unsigned char favicon_data_end[] asm("_binary_data_embed_favicon_png_gz_end");
 extern const size_t favicon_data_len = favicon_data_end - favicon_data;
 
-extern const unsigned char aprs_symbols_48_0_data[] asm("_binary_data_embed_aprs_symbols_48_0_png_gz_start");
-extern const unsigned char aprs_symbols_48_0_data_end[] asm("_binary_data_embed_aprs_symbols_48_0_png_gz_end");
-extern const size_t aprs_symbols_48_0_data_len = aprs_symbols_48_0_data_end - aprs_symbols_48_0_data;
+extern const unsigned char aprs_symbols_24_0_data[] asm("_binary_data_embed_aprs_symbols_24_0_png_gz_start");
+extern const unsigned char aprs_symbols_24_0_data_end[] asm("_binary_data_embed_aprs_symbols_24_0_png_gz_end");
+extern const size_t aprs_symbols_24_0_data_len = aprs_symbols_24_0_data_end - aprs_symbols_24_0_data;
 
-extern const unsigned char aprs_symbols_48_1_data[] asm("_binary_data_embed_aprs_symbols_48_1_png_gz_start");
-extern const unsigned char aprs_symbols_48_1_data_end[] asm("_binary_data_embed_aprs_symbols_48_1_png_gz_end");
-extern const size_t aprs_symbols_48_1_data_len = aprs_symbols_48_1_data_end - aprs_symbols_48_1_data;
+extern const unsigned char aprs_symbols_24_1_data[] asm("_binary_data_embed_aprs_symbols_24_1_png_gz_start");
+extern const unsigned char aprs_symbols_24_1_data_end[] asm("_binary_data_embed_aprs_symbols_24_1_png_gz_end");
+extern const size_t aprs_symbols_24_1_data_len = aprs_symbols_24_1_data_end - aprs_symbols_24_1_data;
 
-extern const unsigned char aprs_symbols_48_2_data[] asm("_binary_data_embed_aprs_symbols_48_2_png_gz_start");
-extern const unsigned char aprs_symbols_48_2_data_end[] asm("_binary_data_embed_aprs_symbols_48_2_png_gz_end");
-extern const size_t aprs_symbols_48_2_data_len = aprs_symbols_48_2_data_end - aprs_symbols_48_2_data;
+extern const unsigned char aprs_symbols_24_2_data[] asm("_binary_data_embed_aprs_symbols_24_2_png_gz_start");
+extern const unsigned char aprs_symbols_24_2_data_end[] asm("_binary_data_embed_aprs_symbols_24_2_png_gz_end");
+extern const size_t aprs_symbols_24_2_data_len = aprs_symbols_24_2_data_end - aprs_symbols_24_2_data;
 
 
 namespace WEB_Utils {
@@ -104,36 +104,36 @@ namespace WEB_Utils {
         request->send(response);
     }
 
-    void handleAprsSymbols48Primary(AsyncWebServerRequest *request) {
+    void handleAprsSymbols24Primary(AsyncWebServerRequest *request) {
         AsyncWebServerResponse *response = request->beginResponse(
             200,
             "image/png",
-            (const uint8_t*)aprs_symbols_48_0_data,
-            aprs_symbols_48_0_data_len
+            (const uint8_t*)aprs_symbols_24_0_data,
+            aprs_symbols_24_0_data_len
         );
         response->addHeader("Content-Encoding", "gzip");
         response->addHeader("Cache-Control", "max-age=3600");
         request->send(response);
     }
 
-    void handleAprsSymbols48Alternate(AsyncWebServerRequest *request) {
+    void handleAprsSymbols24Alternate(AsyncWebServerRequest *request) {
         AsyncWebServerResponse *response = request->beginResponse(
             200,
             "image/png",
-            (const uint8_t*)aprs_symbols_48_1_data,
-            aprs_symbols_48_1_data_len
+            (const uint8_t*)aprs_symbols_24_1_data,
+            aprs_symbols_24_1_data_len
         );
         response->addHeader("Content-Encoding", "gzip");
         response->addHeader("Cache-Control", "max-age=3600");
         request->send(response);
     }
 
-    void handleAprsSymbols48Overlay(AsyncWebServerRequest *request) {
+    void handleAprsSymbols24Overlay(AsyncWebServerRequest *request) {
         AsyncWebServerResponse *response = request->beginResponse(
             200,
             "image/png",
-            (const uint8_t*)aprs_symbols_48_2_data,
-            aprs_symbols_48_2_data_len
+            (const uint8_t*)aprs_symbols_24_2_data,
+            aprs_symbols_24_2_data_len
         );
         response->addHeader("Content-Encoding", "gzip");
         response->addHeader("Cache-Control", "max-age=3600");
@@ -322,6 +322,7 @@ namespace WEB_Utils {
         Config.tnc.enableSerial             = request->hasParam("tnc.enableSerial", true);
         Config.tnc.acceptOwn                = request->hasParam("tnc.acceptOwn", true);
         Config.tnc.aprsBridgeActive         = request->hasParam("tnc.aprsBridgeActive", true);
+        Config.tnc.kissProtocol             = getParamStringSafe("tnc.kissProtocol", Config.tnc.kissProtocol ? "KISS" : "TNC2") != "TNC2";
 
         Config.mqtt.active                  = request->hasParam("mqtt.active", true);
         if (Config.mqtt.active) {
@@ -449,9 +450,9 @@ namespace WEB_Utils {
             server.on("/leaflet.css", HTTP_GET, handleLeafletStyle);
             server.on("/leaflet.js", HTTP_GET, handleLeafletScript);
             server.on("/favicon.png", HTTP_GET, handleFavicon);
-            server.on("/aprs-symbols-48-0.png", HTTP_GET, handleAprsSymbols48Primary);
-            server.on("/aprs-symbols-48-1.png", HTTP_GET, handleAprsSymbols48Alternate);
-            server.on("/aprs-symbols-48-2.png", HTTP_GET, handleAprsSymbols48Overlay);
+            server.on("/aprs-symbols-24-0.png", HTTP_GET, handleAprsSymbols24Primary);
+            server.on("/aprs-symbols-24-1.png", HTTP_GET, handleAprsSymbols24Alternate);
+            server.on("/aprs-symbols-24-2.png", HTTP_GET, handleAprsSymbols24Overlay);
 
             OTA_Utils::setup(&server); // Include OTA Updater for WebServer
 

tools/compress.py

@@ -29,9 +29,9 @@ files = [
   'data_embed/leaflet.js',
   'data_embed/leaflet.css',
   'data_embed/favicon.png',
-  'data_embed/aprs-symbols-48-0.png',
-  'data_embed/aprs-symbols-48-1.png',
-  'data_embed/aprs-symbols-48-2.png',
+  'data_embed/aprs-symbols-24-0.png',
+  'data_embed/aprs-symbols-24-1.png',
+  'data_embed/aprs-symbols-24-2.png',
 ]
 
 string_to_find_str = "String"