update readme v314

README.md

@@ -32,7 +32,7 @@ ____________________________________________________
 
 - T-Deck Plus (and also regular T-Deck with/without GPS).
 
-- HELTEC V2, V3, V3.2, T114, Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker, Wireless Paper.
+- HELTEC V2, V3, V3.2, T114, Wireless Stick, Wireless Stick Lite V3/V3.2, HT-CT62, Wireless Tracker, Wireless Paper.
 
 - RAK Wireless 4631 + 19007(or 19003)
 
@@ -51,9 +51,12 @@ ____________________________________________________
 <br />
 
 # Timeline (Versions):
-
+- 2025-10-15 APRS Bridge for TNC added.
-- 2025-10-11 User defined NTP server added.
+- 2025-10-13 Rx and Tx Frequencies are now with fully configurable.
-- 2025-10-10 Changed Wiki into a pdf manual.
+- 2025-10-13 Startup Delay to allow the Router/Modem to start WiFiAP before connecting.
+- 2025-10-12 Choose to send Beacon on Rx or Tx frequency.
+- 2025-10-11 User defined NTP server and send beacon over MQTT added.
+- 2025-10-10 Converted the Wiki into a PDF manual.
 - 2025-09-26 Heltec Wireless Bridge support added.
 - 2025-09-09 MQTT added (pub+sub), Status defined by Op now and many fixes more.
 - 2025-06-20 Digipeaters now with updated EcoMode (Board Sleeps until packet Rx reducing current consumption to almost 10% at idle).

data/igate_conf.json

@@ -17,6 +17,7 @@
         "path": "WIDE1-1",
         "sendViaAPRSIS": false,
         "sendViaRF": false,
+        "beaconFreq": 1,
         "statusActive": false,
         "statusPacket": "",
         "gpsActive": false,
@@ -38,14 +39,17 @@
         "ecoMode": 0
     },
     "lora": {
-        "txFreq": 433775000,
+        "rxActive": true,
         "rxFreq": 433775000,
-        "spreadingFactor": 12,
+        "rxSpreadingFactor": 12,
-        "signalBandwidth": 125000,
+        "rxCodingRate4": 5,
-        "codingRate4": 5,
+        "rxSignalBandwidth": 125000,
-        "power": 20,
         "txActive": false,
-        "rxActive": true
+        "txFreq": 433775000,
+        "txSpreadingFactor": 12,
+        "txCodingRate4": 5,
+        "txSignalBandwidth": 125000,
+        "power": 20
     },
     "display": {
         "alwaysOn": true,
@@ -78,7 +82,8 @@
     "tnc": {
         "enableServer": false,
         "enableSerial": false,
-        "acceptOwn": false
+        "acceptOwn": false,
+        "aprsBrigdeActive": false
     },
     "mqtt": {
         "active": false,
@@ -86,7 +91,8 @@
         "topic": "",
         "username": "",
         "password": "",
-        "port": 1883
+        "port": 1883,
+        "beaconOverMqtt": false
     },
     "ota": {
         "username": "",
@@ -108,6 +114,7 @@
         "rememberStationTime": 30,
         "backupDigiMode": false,
         "rebootMode": false,
-        "rebootModeTime": 6
+        "rebootModeTime": 6,
+        "startupDelay": 0
     }
 }

data_embed/script.js

@@ -95,6 +95,7 @@ function loadSettings(settings) {
         networksContainer.appendChild(networkElement);
         networkCount++;
     });
+    document.getElementById("startupDelay").value                       = settings.startupDelay;
 
     // APRS-IS
     document.getElementById("aprs_is.active").checked                   = settings.aprs_is.active;
@@ -118,7 +119,11 @@ function loadSettings(settings) {
     document.getElementById("beacon.interval").value                    = settings.beacon.interval;
     document.getElementById("other.rememberStationTime").value          = settings.other.rememberStationTime;   
     document.getElementById("beacon.sendViaAPRSIS").checked             = settings.beacon.sendViaAPRSIS;
+
     document.getElementById("beacon.sendViaRF").checked                 = settings.beacon.sendViaRF;
+    document.getElementById("beacon.beaconFreq").value                  = settings.beacon.beaconFreq;
+    BeaconingViaRFCheckbox.checked  = settings.beacon.sendViaRF;
+    BeaconingFrequency.disabled     = !BeaconingViaRFCheckbox.checked;
 
     document.getElementById("beacon.statusActive").checked              = settings.beacon.statusActive;
     document.getElementById("beacon.statusPacket").value                = settings.beacon.statusPacket;
@@ -136,13 +141,16 @@ function loadSettings(settings) {
     document.getElementById("digi.ecoMode").value                       = settings.digi.ecoMode;
 
     // LoRa
-    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.rxFreq").value                        = settings.lora.rxFreq;
-    document.getElementById("lora.signalBandwidth").value               = settings.lora.signalBandwidth;
+    document.getElementById("lora.rxSpreadingFactor").value             = settings.lora.rxSpreadingFactor;
-    document.getElementById("lora.codingRate4").value                   = settings.lora.codingRate4;
+    document.getElementById("lora.rxCodingRate4").value                 = settings.lora.rxCodingRate4;
+    document.getElementById("lora.rxSignalBandwidth").value             = settings.lora.rxSignalBandwidth;
+    document.getElementById("lora.txActive").checked                    = settings.lora.txActive;
+    document.getElementById("lora.txFreq").value                        = settings.lora.txFreq;
+    document.getElementById("lora.txSpreadingFactor").value             = settings.lora.txSpreadingFactor;
+    document.getElementById("lora.txCodingRate4").value                 = settings.lora.txCodingRate4;
+    document.getElementById("lora.txSignalBandwidth").value             = settings.lora.txSignalBandwidth;    
     document.getElementById("lora.power").value                         = settings.lora.power;
 
     // Display
@@ -198,6 +206,7 @@ function loadSettings(settings) {
         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.aprsBridgeActive").checked         = settings.tnc.aprsBridgeActive;
     }
 
     // MQTT
@@ -207,12 +216,14 @@ function loadSettings(settings) {
     document.getElementById("mqtt.username").value                      = settings.mqtt.username;
     document.getElementById("mqtt.password").value                      = settings.mqtt.password;
     document.getElementById("mqtt.port").value                          = settings.mqtt.port;
-    MqttCheckbox.checked    = settings.mqtt.active;
+    document.getElementById("mqtt.beaconOverMqtt").value                = settings.mqtt.beaconOverMqtt;
-    MqttServer.disabled     = !MqttCheckbox.check;
+    MqttCheckbox.checked        = settings.mqtt.active;
-    MqttTopic.disabled      = !MqttCheckbox.check;
+    MqttServer.disabled         = !MqttCheckbox.check;
-    MqttUsername.disabled   = !MqttCheckbox.check;
+    MqttTopic.disabled          = !MqttCheckbox.check;
-    MqttPassword.disabled   = !MqttCheckbox.check;
+    MqttUsername.disabled       = !MqttCheckbox.check;
-    MqttPort.disabled       = !MqttCheckbox.check;
+    MqttPassword.disabled       = !MqttCheckbox.check;
+    MqttPort.disabled           = !MqttCheckbox.check;
+    MqttBeaconOverMqtt.disabled = !MqttCheckbox.check;
 
     // Reboot
     document.getElementById("other.rebootMode").checked                 = settings.other.rebootMode;
@@ -248,7 +259,6 @@ function loadSettings(settings) {
     document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
 
     updateImage();
-    refreshSpeedStandard();
 }
 
 function showToast(message) {
@@ -300,6 +310,12 @@ function updateImage() {
     }
 }
 
+// Beaconing Switches
+const BeaconingViaRFCheckbox    = document.querySelector('input[name="beacon.sendViaRF"]');
+const BeaconingFrequency        = document.querySelector('select[name="beacon.beaconFreq"]');
+BeaconingViaRFCheckbox.addEventListener("change", function() {
+    BeaconingFrequency.disabled = !this.checked;
+});
 
 // Status Switch
 const StatusCheckbox            = document.querySelector('input[name="beacon.statusActive"]');
@@ -380,12 +396,14 @@ const MqttTopic                 = document.querySelector('input[name="mqtt.topic
 const MqttUsername              = document.querySelector('input[name="mqtt.username"]');
 const MqttPassword              = document.querySelector('input[name="mqtt.password"]');
 const MqttPort                  = document.querySelector('input[name="mqtt.port"]');
+const MqttBeaconOverMqtt        = document.querySelector('input[name="mqtt.beaconOverMqtt"]');
 MqttCheckbox.addEventListener("change", function () {
     MqttServer.disabled         = !this.checked;
     MqttTopic.disabled          = !this.checked;
     MqttUsername.disabled       = !this.checked;
     MqttPassword.disabled       = !this.checked;
     MqttPort.disabled           = !this.checked;
+    MqttBeaconOverMqtt.disabled = !this.checked;
 });
 
 // Reboot Switches
@@ -452,65 +470,6 @@ document
         updateImage();
     });
 
-const speedStandards = {
-    300: [125, 5, 12],
-    244: [125, 6, 12],
-    209: [125, 7, 12],
-    183: [125, 8, 12],
-    610: [125, 8, 10],
-    1200: [125, 7, 9],
-};
-
-function refreshSpeedStandard() {
-    const bw = Number(document.getElementById("lora.signalBandwidth").value);
-    const cr4 = Number(document.getElementById("lora.codingRate4").value);
-    const sf = Number(document.getElementById("lora.spreadingFactor").value);
-
-    let found = false;
-
-    for (const speed in speedStandards) {
-        const standard = speedStandards[speed];
-
-        if (standard[0] !== bw / 1000) continue;
-        if (standard[1] !== cr4) continue;
-        if (standard[2] !== sf) continue;
-
-        document.getElementById("action.speed").value = speed;
-        found = true;
-
-        break;
-    }
-
-    if (!found) {
-        document.getElementById("action.speed").value = "";
-    }
-}
-
-document
-    .getElementById("lora.signalBandwidth")
-    .addEventListener("focusout", refreshSpeedStandard);
-document
-    .getElementById("lora.codingRate4")
-    .addEventListener("focusout", refreshSpeedStandard);
-document
-    .getElementById("lora.spreadingFactor")
-    .addEventListener("focusout", refreshSpeedStandard);
-
-document.getElementById("action.speed").addEventListener("change", function () {
-    const speed = document.getElementById("action.speed").value;
-
-    if (speed !== "") {
-        const value = speedStandards[Number(speed)];
-
-        const bw = value[0];
-        const cr4 = value[1];
-        const sf = value[2];
-
-        document.getElementById("lora.signalBandwidth").value = bw * 1000;
-        document.getElementById("lora.codingRate4").value = cr4;
-        document.getElementById("lora.spreadingFactor").value = sf;
-    }
-});
 
 const form = document.querySelector("form");
 

include/configuration.h

@@ -45,12 +45,13 @@ public:
     String  overlay;
     String  symbol;
     String  path;    
-    bool    sendViaRF;
     bool    sendViaAPRSIS;
-    bool    gpsActive;
+    bool    sendViaRF;
-    bool    gpsAmbiguity;
+    int     beaconFreq;
     bool    statusActive;
     String  statusPacket;
+    bool    gpsActive;
+    bool    gpsAmbiguity;    
 };
 
 class APRS_IS {
@@ -67,18 +68,21 @@ public:
 class DIGI {
 public:
     int     mode;
-    int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)
+    int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)  
 };
 
 class LoraModule {
 public:
-    long    txFreq;
-    long    rxFreq;
-    bool    txActive;
     bool    rxActive;
-    int     spreadingFactor;
+    long    rxFreq;
-    long    signalBandwidth;
+    int     rxSpreadingFactor;
-    int     codingRate4;
+    int     rxCodingRate4;
+    long    rxSignalBandwidth;    
+    bool    txActive;
+    long    txFreq;
+    int     txSpreadingFactor;
+    int     txCodingRate4;
+    long    txSignalBandwidth;
     int     power;
 };
 
@@ -123,6 +127,7 @@ public:
     bool    enableServer;
     bool    enableSerial;
     bool    acceptOwn;
+    bool    aprsBridgeActive;
 };
 
 class OTA {
@@ -158,6 +163,7 @@ public:
     String  username;
     String  password;
     int     port;
+    bool    beaconOverMqtt;
 };
 
 class Configuration {
@@ -167,6 +173,7 @@ public:
     bool                    backupDigiMode;
     bool                    rebootMode;
     int                     rebootModeTime;
+    int                     startupDelay;
     String                  personalNote;
     String                  blacklist;
     std::vector<WiFi_AP>    wifiAPs;

include/station_utils.h

@@ -23,12 +23,6 @@
 #include <Arduino.h>
 
 
-struct Packet25SegBuffer {
-    uint32_t    receivedTime;
-    String      station;
-    String      payload;
-};
-
 struct LastHeardStation {
     uint32_t    lastHeardTime;
     String      station;
@@ -47,7 +41,7 @@ namespace STATION_Utils {
     bool check25SegBuffer(const String& station, const String& textMessage);
     void processOutputPacketBufferUltraEcoMode();
     void processOutputPacketBuffer();
-    void addToOutputPacketBuffer(const String& packet);
+    void addToOutputPacketBuffer(const String& packet, bool flag = false);
 
 }
 

include/tnc_utils.h

@@ -27,8 +27,8 @@ namespace TNC_Utils {
     void setup();
     void loop();
 
-    void sendToClients(const String& packet);
+    void sendToClients(const String& packet, bool stripBytes = false);
-    void sendToSerial(const String& packet);
+    void sendToSerial(const String& packet, bool stripBytes = false);
 
 }
 

include/utils.h

@@ -35,7 +35,7 @@ namespace Utils {
     void    processStatus();
     String  getLocalIP();
     void    setupDisplay();
-    void    activeStations();
+    void    showActiveStations();
     void    checkBeaconInterval();
     void    checkDisplayInterval();
     void    validateFreqs();
@@ -46,6 +46,7 @@ namespace Utils {
     void    checkRebootTime();
     void    checkSleepByLowBatteryVoltage(uint8_t mode);
     bool    checkValidCallsign(const String& callsign);
+    void    startupDelay();
 
 }
 

src/LoRa_APRS_iGate.cpp

@@ -33,7 +33,7 @@
                 ╚═╝ ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚══════╝
 
 
-                       Ricardo Guzman - CA2RXU 
+                       Ricardo Guzman - CA2RXU
            https://github.com/richonguzman/LoRa_APRS_iGate
              (donations : http://paypal.me/richonguzman)
 ___________________________________________________________________*/
@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-10-11";
+String              versionDate             = "2025-10-15";
-String              versionNumber           = "3.1.3";
+String              versionNumber           = "3.1.4";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -97,7 +97,6 @@ bool                modemLoggedToAPRSIS     = false;
 std::vector<ReceivedPacket> receivedPackets;
 
 String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
-//#define STARTUP_DELAY 5 //min
 
 
 void setup() {
@@ -108,12 +107,7 @@ void setup() {
     Utils::validateFreqs();
     GPS_Utils::setup();
     STATION_Utils::loadBlacklistAndManagers();
-
+    Utils::startupDelay();
-    #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
-        displayShow("", "  STARTUP DELAY ...", "", "", 0);
-        delay(STARTUP_DELAY * 60 * 1000);
-    #endif
-
     SLEEP_Utils::setup();
     WIFI_Utils::setup();
     NTP_Utils::setup();
@@ -198,9 +192,9 @@ void loop() {
                 DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
             }
 
-            if (Config.tnc.enableServer) TNC_Utils::sendToClients(packet);  // Send received packet to TNC KISS
+            if (Config.tnc.enableServer) TNC_Utils::sendToClients(packet, true);    // Send received packet to TNC KISS
-            if (Config.tnc.enableSerial) TNC_Utils::sendToSerial(packet);   // Send received packet to Serial KISS
+            if (Config.tnc.enableSerial) TNC_Utils::sendToSerial(packet, true);     // Send received packet to Serial KISS
-            if (Config.mqtt.active) MQTT_Utils::sendToMqtt(packet);         // Send received packet to MQTT
+            if (Config.mqtt.active) MQTT_Utils::sendToMqtt(packet);                 // Send received packet to MQTT
         }
 
         if (Config.aprs_is.active) APRS_IS_Utils::listenAPRSIS();           // listen received packet from APRSIS

src/aprs_is_utils.cpp

@@ -25,6 +25,7 @@
 #include "query_utils.h"
 #include "A7670_utils.h"
 #include "digi_utils.h"
+#include "tnc_utils.h"
 #include "display.h"
 #include "utils.h"
 
@@ -367,6 +368,10 @@ namespace APRS_IS_Utils {
                     Serial.println(" ---> Rejected (Time): No Tx");
                 }
             }
+            if (Config.tnc.aprsBridgeActive) {
+                if (Config.tnc.enableServer) TNC_Utils::sendToClients(packet);  // Send received packet to TNC KISS
+                if (Config.tnc.enableSerial) TNC_Utils::sendToSerial(packet);   // Send received packet to Serial KISS
+            }
         }
     }
 

src/configuration.cpp

@@ -45,6 +45,8 @@ bool Configuration::writeFile() {
             }
         }
 
+        data["other"]["startupDelay"]               = startupDelay;
+
         data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
         data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
@@ -66,9 +68,11 @@ bool Configuration::writeFile() {
         data["beacon"]["longitude"]                 = beacon.longitude;
         data["beacon"]["overlay"]                   = beacon.overlay;
         data["beacon"]["symbol"]                    = beacon.symbol;
+        data["beacon"]["path"]                      = beacon.path;
+
         data["beacon"]["sendViaAPRSIS"]             = beacon.sendViaAPRSIS;
         data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
-        data["beacon"]["path"]                      = beacon.path;
+        data["beacon"]["beaconFreq"]                = beacon.beaconFreq;
 
         data["beacon"]["statusActive"]              = beacon.statusActive;
         data["beacon"]["statusPacket"]              = beacon.statusPacket;
@@ -86,14 +90,17 @@ bool Configuration::writeFile() {
             if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
         #endif
 
-        data["lora"]["rxFreq"]                      = loramodule.rxFreq;
-        data["lora"]["txFreq"]                      = loramodule.txFreq;
-        data["lora"]["spreadingFactor"]             = loramodule.spreadingFactor;
-        data["lora"]["signalBandwidth"]             = loramodule.signalBandwidth;
-        data["lora"]["codingRate4"]                 = loramodule.codingRate4;
-        data["lora"]["power"]                       = loramodule.power;
-        data["lora"]["txActive"]                    = loramodule.txActive;
         data["lora"]["rxActive"]                    = loramodule.rxActive;
+        data["lora"]["rxFreq"]                      = loramodule.rxFreq;
+        data["lora"]["rxSpreadingFactor"]           = loramodule.rxSpreadingFactor;
+        data["lora"]["rxCodingRate4"]               = loramodule.rxCodingRate4;
+        data["lora"]["rxSignalBandwidth"]           = loramodule.rxSignalBandwidth;
+        data["lora"]["txActive"]                    = loramodule.txActive;      
+        data["lora"]["txFreq"]                      = loramodule.txFreq;
+        data["lora"]["txSpreadingFactor"]           = loramodule.txSpreadingFactor;
+        data["lora"]["txCodingRate4"]               = loramodule.txCodingRate4;
+        data["lora"]["txSignalBandwidth"]           = loramodule.txSignalBandwidth;        
+        data["lora"]["power"]                       = loramodule.power;        
 
         data["display"]["alwaysOn"]                 = display.alwaysOn;
         data["display"]["timeout"]                  = display.timeout;
@@ -124,6 +131,7 @@ bool Configuration::writeFile() {
         data["tnc"]["enableServer"]                 = tnc.enableServer;
         data["tnc"]["enableSerial"]                 = tnc.enableSerial;
         data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
+        data["tnc"]["aprsBridgeActive"]             = tnc.aprsBridgeActive;
 
         data["mqtt"]["active"]                      = mqtt.active;
         data["mqtt"]["server"]                      = mqtt.server;
@@ -131,6 +139,7 @@ bool Configuration::writeFile() {
         data["mqtt"]["username"]                    = mqtt.username;
         data["mqtt"]["password"]                    = mqtt.password;
         data["mqtt"]["port"]                        = mqtt.port;
+        data["mqtt"]["beaconOverMqtt"]              = mqtt.beaconOverMqtt;
 
         data["ota"]["username"]                     = ota.username;
         data["ota"]["password"]                     = ota.password;
@@ -184,6 +193,9 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
 
+        if (!data["other"].containsKey("startupDelay")) needsRewrite = true;
+        startupDelay                    = data["other"]["startupDelay"] | 0;
+
         if (!data["wifi"]["autoAP"].containsKey("password") ||
             !data["wifi"]["autoAP"].containsKey("timeout")) needsRewrite = true;
         wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
@@ -216,6 +228,7 @@ bool Configuration::readFile() {
             !data["beacon"].containsKey("path") ||
             !data["beacon"].containsKey("sendViaAPRSIS") ||
             !data["beacon"].containsKey("sendViaRF") ||
+            !data["beacon"].containsKey("beaconFreq") ||
             !data["beacon"].containsKey("statusActive") ||
             !data["beacon"].containsKey("statusPacket") ||
             !data["beacon"].containsKey("gpsActive") ||
@@ -229,6 +242,7 @@ bool Configuration::readFile() {
         beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
         beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
         beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
+        beacon.beaconFreq               = data["beacon"]["beaconFreq"] | 1;
         beacon.statusActive             = data["beacon"]["statusActive"] | false;
         beacon.statusPacket             = data["beacon"]["statusPacket"] | "";
         beacon.gpsActive                = data["beacon"]["gpsActive"] | false;
@@ -245,28 +259,33 @@ bool Configuration::readFile() {
         digi.mode                       = data["digi"]["mode"] | 0;
         digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
         if (digi.ecoMode == 1) shouldSleepStop = false;
-
         #if defined(HAS_A7670)
             if (digi.ecoMode == 1) digi.ecoMode = 2;
         #endif
 
-        if (!data["lora"].containsKey("txFreq") ||
+        if (!data["lora"].containsKey("rxActive") ||
             !data["lora"].containsKey("rxFreq") ||
-            !data["lora"].containsKey("spreadingFactor") ||
+            !data["lora"].containsKey("rxSpreadingFactor") ||
-            !data["lora"].containsKey("signalBandwidth") ||
+            !data["lora"].containsKey("rxCodingRate4") ||
-            !data["lora"].containsKey("codingRate4") ||
+            !data["lora"].containsKey("rxSignalBandwidth") ||
-            !data["lora"].containsKey("power") ||
             !data["lora"].containsKey("txActive") ||
-            !data["lora"].containsKey("rxActive")) needsRewrite = true;
+            !data["lora"].containsKey("txFreq") ||
-        loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
+            !data["lora"].containsKey("txSpreadingFactor") ||
+            !data["lora"].containsKey("txCodingRate4") ||
+            !data["lora"].containsKey("txSignalBandwidth") ||
+            !data["lora"].containsKey("power")) needsRewrite = true;
+        loramodule.rxActive             = data["lora"]["rxActive"] | true;
         loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
-        loramodule.spreadingFactor      = data["lora"]["spreadingFactor"] | 12;
+        loramodule.rxSpreadingFactor    = data["lora"]["rxSpreadingFactor"] | 12;
-        loramodule.signalBandwidth      = data["lora"]["signalBandwidth"] | 125000;
+        loramodule.rxCodingRate4        = data["lora"]["rxCodingRate4"] | 5;
-        loramodule.codingRate4          = data["lora"]["codingRate4"] | 5;
+        loramodule.rxSignalBandwidth    = data["lora"]["rxSignalBandwidth"] | 125000;        
-        loramodule.power                = data["lora"]["power"] | 20;
         loramodule.txActive             = data["lora"]["txActive"] | false;
-        loramodule.rxActive             = data["lora"]["rxActive"] | false;
+        loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
-
+        loramodule.txSpreadingFactor    = data["lora"]["txSpreadingFactor"] | 12;
+        loramodule.txCodingRate4        = data["lora"]["txCodingRate4"] | 5;
+        loramodule.txSignalBandwidth    = data["lora"]["txSignalBandwidth"] | 125000;
+        loramodule.power                = data["lora"]["power"] | 20;
+        
         if (!data["display"].containsKey("alwaysOn") ||
             !data["display"].containsKey("timeout") ||
             !data["display"].containsKey("turn180")) needsRewrite = true;
@@ -313,23 +332,27 @@ bool Configuration::readFile() {
 
         if (!data["tnc"].containsKey("enableServer") ||
             !data["tnc"].containsKey("enableSerial") ||
-            !data["tnc"].containsKey("acceptOwn")) needsRewrite = true;
+            !data["tnc"].containsKey("acceptOwn") ||
+            !data["tnc"].containsKey("aprsBridgeActive")) 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;
 
         if (!data["mqtt"].containsKey("active") ||
             !data["mqtt"].containsKey("server") ||
             !data["mqtt"].containsKey("topic") ||
             !data["mqtt"].containsKey("username") ||
             !data["mqtt"].containsKey("password") ||
-            !data["mqtt"].containsKey("port")) needsRewrite = true;
+            !data["mqtt"].containsKey("port") ||
+            !data["mqtt"].containsKey("beaconOverMqtt")) needsRewrite = true;
         mqtt.active                     = data["mqtt"]["active"] | false;
         mqtt.server                     = data["mqtt"]["server"] | "";
         mqtt.topic                      = data["mqtt"]["topic"] | "aprs-igate";
         mqtt.username                   = data["mqtt"]["username"] | "";
         mqtt.password                   = data["mqtt"]["password"] | "";
         mqtt.port                       = data["mqtt"]["port"] | 1883;
+        mqtt.beaconOverMqtt             = data["mqtt"]["beaconOverMqtt"] | false;
         
         if (!data["ota"].containsKey("username") ||
             !data["ota"].containsKey("password")) needsRewrite = true;
@@ -395,6 +418,8 @@ void Configuration::setDefaultValues() {
 
     wifiAPs.push_back(wifiap);
 
+    startupDelay                    = 0;
+
     wifiAutoAP.password             = "1234567890";
     wifiAutoAP.timeout              = 10;
 
@@ -414,10 +439,12 @@ void Configuration::setDefaultValues() {
     beacon.interval                 = 15;
     beacon.overlay                  = "L";
     beacon.symbol                   = "a";
-    beacon.sendViaAPRSIS            = true;
-    beacon.sendViaRF                = false;
     beacon.path                     = "WIDE1-1";
 
+    beacon.sendViaAPRSIS            = true;
+    beacon.sendViaRF                = false;
+    beacon.beaconFreq               = 1;
+    
     beacon.statusActive             = false;
     beacon.statusPacket             = "";    
 
@@ -431,14 +458,17 @@ void Configuration::setDefaultValues() {
     digi.mode                       = 0;
     digi.ecoMode                    = 0;
 
-    loramodule.txFreq               = 433775000;
-    loramodule.rxFreq               = 433775000;
-    loramodule.spreadingFactor      = 12;
-    loramodule.signalBandwidth      = 125000;
-    loramodule.codingRate4          = 5;
-    loramodule.power                = 20;
-    loramodule.txActive             = false;
     loramodule.rxActive             = true;
+    loramodule.rxFreq               = 433775000;
+    loramodule.rxSpreadingFactor    = 12;
+    loramodule.rxCodingRate4        = 5;
+    loramodule.rxSignalBandwidth    = 125000;
+    loramodule.txActive             = false;
+    loramodule.txFreq               = 433775000;
+    loramodule.txSpreadingFactor    = 12;
+    loramodule.txCodingRate4        = 5;
+    loramodule.txSignalBandwidth    = 125000;
+    loramodule.power                = 20;
 
     display.alwaysOn                = true;
     display.timeout                 = 4;
@@ -469,6 +499,7 @@ void Configuration::setDefaultValues() {
     tnc.enableServer                = false;
     tnc.enableSerial                = false;
     tnc.acceptOwn                   = false;
+    tnc.aprsBridgeActive            = false;
 
     mqtt.active                     = false;
     mqtt.server                     = "";
@@ -476,6 +507,7 @@ void Configuration::setDefaultValues() {
     mqtt.username                   = "";
     mqtt.password                   = "";
     mqtt.port                       = 1883;
+    mqtt.beaconOverMqtt             = false;
 
     ota.username                    = "";
     ota.password                    = "";

src/display.cpp

@@ -96,6 +96,7 @@ void displaySetup() {
             #ifdef HAS_EPAPER
                 display.landscape();
                 display.printCenter("LoRa APRS iGate Initialising...");
+                if (Config.display.turn180) display.setRotation(2);
                 display.update();
             #else
                 #ifdef OLED_DISPLAY_HAS_RST_PIN

src/lora_utils.cpp

@@ -30,6 +30,7 @@
 
 extern Configuration    Config;
 extern uint32_t         lastRxTime;
+extern bool             packetIsBeacon;
 
 extern std::vector<ReceivedPacket> receivedPackets;
 
@@ -92,10 +93,10 @@ namespace LoRa_Utils {
         #if defined(HAS_SX1278) || defined(HAS_SX1276)
             radio.setDio0Action(setFlag, RISING);
         #endif
-        radio.setSpreadingFactor(Config.loramodule.spreadingFactor);
+        radio.setSpreadingFactor(Config.loramodule.rxSpreadingFactor);
-        float signalBandwidth = Config.loramodule.signalBandwidth/1000;
+        radio.setCodingRate(Config.loramodule.rxCodingRate4);
-        radio.setBandwidth(signalBandwidth);
+        float signalBandwidth = Config.loramodule.rxSignalBandwidth/1000;
-        radio.setCodingRate(Config.loramodule.codingRate4);
+        radio.setBandwidth(signalBandwidth);        
         radio.setCRC(true);
 
         #if (defined(RADIO_RXEN) && defined(RADIO_TXEN))    // QRP Labs LightGateway has 400M22S (SX1268)
@@ -128,22 +129,30 @@ namespace LoRa_Utils {
     }
 
     void changeFreqTx() {
-        delay(500);
+        delay(300);
         float freq = (float)Config.loramodule.txFreq / 1000000;
         radio.setFrequency(freq);
+        radio.setSpreadingFactor(Config.loramodule.txSpreadingFactor);
+        radio.setCodingRate(Config.loramodule.txCodingRate4);
+        radio.setBandwidth(Config.loramodule.txSignalBandwidth);
     }
 
     void changeFreqRx() {
-        delay(500);
+        delay(300);
         float freq = (float)Config.loramodule.rxFreq / 1000000;
         radio.setFrequency(freq);
+        radio.setSpreadingFactor(Config.loramodule.rxSpreadingFactor);
+        radio.setCodingRate(Config.loramodule.rxCodingRate4);
+        radio.setBandwidth(Config.loramodule.rxSignalBandwidth);
     }
 
     void sendNewPacket(const String& newPacket) {
         if (!Config.loramodule.txActive) return;
 
         if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
-            changeFreqTx();
+            if (!packetIsBeacon || (packetIsBeacon && Config.beacon.beaconFreq == 1)) {
+                changeFreqTx();
+            }
         }
         
         #ifdef INTERNAL_LED_PIN
@@ -165,7 +174,9 @@ namespace LoRa_Utils {
             if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, LOW);      // disabled in Ultra Eco Mode
         #endif
         if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
-            changeFreqRx();
+            if (!packetIsBeacon || (packetIsBeacon && Config.beacon.beaconFreq == 1)) {
+                changeFreqRx();
+            }
         }
     }
 

src/ntp_utils.cpp

@@ -27,7 +27,7 @@
 extern      Configuration  Config;
 
 WiFiUDP     ntpUDP;
-NTPClient   timeClient(ntpUDP, Config.ntp.server.c_str(), 0, 15 * 60 * 1000);  // Update interval 15 min
+NTPClient*  timeClient;
 
 
 namespace NTP_Utils {
@@ -35,17 +35,17 @@ namespace NTP_Utils {
     void setup() {
         if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") {
             int gmt = Config.ntp.gmtCorrection * 3600;
-            timeClient.setTimeOffset(gmt);
+            timeClient = new NTPClient(ntpUDP, Config.ntp.server.c_str(), gmt, 15 * 60 * 1000); // Update interval 15 min
-            timeClient.begin();
+            timeClient->begin();
         }
     }
 
     void update() {
-        if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") timeClient.update();
+        if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") timeClient->update();
     }
 
     String getFormatedTime() {
-        if (Config.digi.ecoMode == 0) return timeClient.getFormattedTime();
+        if (Config.digi.ecoMode == 0) return timeClient->getFormattedTime();
         return "DigiEcoMode Active";
     }
 

src/station_utils.cpp

@@ -33,13 +33,26 @@ extern bool                     shouldSleepLowVoltage;
 
 uint32_t lastTxTime             = millis();
 std::vector<LastHeardStation>   lastHeardStations;
-std::vector<String>             outputPacketBuffer;
-std::vector<Packet25SegBuffer>  packet25SegBuffer;
 std::vector<String>             blacklist;
 std::vector<String>             managers;
 std::vector<LastHeardStation>   lastHeardObjects;
 
+struct OutputPacketBuffer {
+    String      packet;
+    bool        isBeacon;
+};
+std::vector<OutputPacketBuffer> outputPacketBuffer;
+
+struct Packet25SegBuffer {
+    uint32_t    receivedTime;
+    String      station;
+    String      payload;
+};
+std::vector<Packet25SegBuffer>  packet25SegBuffer;
+
+
 bool saveNewDigiEcoModeConfig   = false;
+bool packetIsBeacon             = false;
 
 
 namespace STATION_Utils {
@@ -138,7 +151,7 @@ namespace STATION_Utils {
             }
         }
         if (!stationHeard) lastHeardStations.emplace_back(LastHeardStation{millis(), station});
-        Utils::activeStations();
+        Utils::showActiveStations();
     }
 
     bool wasHeard(const String& station) {
@@ -171,7 +184,9 @@ namespace STATION_Utils {
         size_t currentIndex = 0;
         while (currentIndex < outputPacketBuffer.size()) {                  // this sends all packets from output buffer
             delay(3000);                                                    // and cleans buffer to avoid sending packets with time offset
-            LoRa_Utils::sendNewPacket(outputPacketBuffer[currentIndex]);    // next time it wakes up
+            if (outputPacketBuffer[currentIndex].isBeacon) packetIsBeacon = true;
+            LoRa_Utils::sendNewPacket(outputPacketBuffer[currentIndex].packet);    // next time it wakes up
+            if (outputPacketBuffer[currentIndex].isBeacon) packetIsBeacon = false;
             currentIndex++;
         }
         outputPacketBuffer.clear();
@@ -190,13 +205,17 @@ namespace STATION_Utils {
         uint32_t lastRx                 = millis() - lastRxTime;
         uint32_t lastTx                 = millis() - lastTxTime;
         if (outputPacketBuffer.size() > 0 && lastTx > timeToWait && lastRx > timeToWait) {
-            LoRa_Utils::sendNewPacket(outputPacketBuffer[0]);
+            if (outputPacketBuffer[0].isBeacon) packetIsBeacon = true;
+            LoRa_Utils::sendNewPacket(outputPacketBuffer[0].packet);
+            if (outputPacketBuffer[0].isBeacon) packetIsBeacon = false;
             outputPacketBuffer.erase(outputPacketBuffer.begin());
             lastTxTime = millis();
         }
         if (shouldSleepLowVoltage) {
             while (outputPacketBuffer.size() > 0) {
-                LoRa_Utils::sendNewPacket(outputPacketBuffer[0]);
+                if (outputPacketBuffer[0].isBeacon) packetIsBeacon = true;
+                LoRa_Utils::sendNewPacket(outputPacketBuffer[0].packet);
+                if (outputPacketBuffer[0].isBeacon) packetIsBeacon = false;
                 outputPacketBuffer.erase(outputPacketBuffer.begin());
                 delay(4000);
             }
@@ -209,8 +228,12 @@ namespace STATION_Utils {
         }
     }
 
-    void addToOutputPacketBuffer(const String& packet) {
+    void addToOutputPacketBuffer(const String& packet, bool flag) {
-        outputPacketBuffer.push_back(packet);
+        OutputPacketBuffer entry;
+        entry.packet    = packet;
+        entry.isBeacon  = flag;
+
+        outputPacketBuffer.push_back(entry);
     }
 
 }

src/tnc_utils.cpp

@@ -21,12 +21,15 @@
 #include "configuration.h"
 #include "station_utils.h"
 #include "kiss_protocol.h"
+#include "aprs_is_utils.h"
 #include "kiss_utils.h"
 #include "tnc_utils.h"
 #include "utils.h"
 
 
-extern Configuration        Config;
+extern Configuration    Config;
+extern WiFiClient       aprsIsClient;
+extern bool             passcodeValid;
 
 #define MAX_CLIENTS 4
 #define INPUT_BUFFER_SIZE (2 + MAX_CLIENTS)
@@ -94,7 +97,8 @@ namespace TNC_Utils {
                 String sender = frame.substring(0,frame.indexOf(">"));
 
                 if (Config.tnc.acceptOwn || sender != Config.callsign) {
-                    STATION_Utils::addToOutputPacketBuffer(frame);
+                    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");
                 }
@@ -131,8 +135,8 @@ namespace TNC_Utils {
         }
     }
 
-    void sendToClients(const String& packet) {
+    void sendToClients(const String& packet, bool stripBytes) {
-        String cleanPacket = packet.substring(3);
+        String cleanPacket = stripBytes ? packet.substring(3): packet;
 
         const String kissEncoded = encodeKISS(cleanPacket);
 
@@ -152,8 +156,8 @@ namespace TNC_Utils {
         Utils::println(cleanPacket);
     }
 
-    void sendToSerial(const String& packet) {
+    void sendToSerial(const String& packet, bool stripBytes) {
-        String cleanPacket = packet.substring(3);
+        String cleanPacket = stripBytes ? packet.substring(3): packet;
         Serial.print(encodeKISS(cleanPacket));
         Serial.flush();
     }

src/utils.cpp

@@ -88,7 +88,7 @@ namespace Utils {
         if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) {
             status.concat(":>");
             status.concat(Config.beacon.statusPacket);
-            STATION_Utils::addToOutputPacketBuffer(status);
+            STATION_Utils::addToOutputPacketBuffer(status, true);   // treated also as beacon on Tx Freq
             statusAfterBoot = false;
         }
     }
@@ -127,7 +127,7 @@ namespace Utils {
         seventhLine = "     listening...";
     }
 
-    void activeStations() {
+    void showActiveStations() {
         char buffer[30]; // Adjust size as needed
         sprintf(buffer, "Stations (%dmin) = %2d", Config.rememberStationTime, lastHeardStations.size());
         fourthLine = buffer;
@@ -159,7 +159,7 @@ namespace Utils {
 
             STATION_Utils::deleteNotHeard();
 
-            activeStations();
+            showActiveStations();
 
             beaconPacket            = iGateBeaconPacket;
             secondaryBeaconPacket   = iGateLoRaBeaconPacket;
@@ -259,7 +259,7 @@ namespace Utils {
                 Utils::println("-- Sending Beacon to RF --");
                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
                 seventhLine = "     listening...";
-                STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket);
+                STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket, true);
             }
 
             lastBeaconTx = millis();
@@ -284,6 +284,7 @@ namespace Utils {
             Serial.println("Tx Freq less than 125kHz from Rx Freq ---> NOT VALID");
             displayShow("Tx Freq is less than ", "125kHz from Rx Freq", "device will autofix", "and then reboot", 1000);
             Config.loramodule.txFreq = Config.loramodule.rxFreq; // Inform about that but then change the TX QRG to RX QRG and reset the device
+            Config.beacon.beaconFreq = 1;   // return to LoRa Tx Beacon Freq
             Config.writeFile();
             ESP.restart();
         }
@@ -436,4 +437,11 @@ namespace Utils {
         return true;
     }
 
+    void startupDelay() {
+        if (Config.startupDelay > 0) {
+            displayShow("", "  STARTUP DELAY ...", "", "", 0);
+            delay(Config.startupDelay * 60 * 1000);
+        }
+    }
+
 }

src/web_utils.cpp

@@ -157,6 +157,8 @@ namespace WEB_Utils {
             Config.wifiAPs.push_back(wifiap);
         }
 
+        Config.startupDelay                 = getParamIntSafe("startupDelay", Config.startupDelay);
+
         Config.callsign                     = getParamStringSafe("callsign", Config.callsign);
         
         Config.wifiAutoAP.password          = getParamStringSafe("wifi.autoAP.password", Config.wifiAutoAP.password);
@@ -175,6 +177,7 @@ namespace WEB_Utils {
         Config.beacon.interval              = getParamIntSafe("beacon.interval", Config.beacon.interval);
         Config.beacon.sendViaAPRSIS         = request->hasParam("beacon.sendViaAPRSIS", true);
         Config.beacon.sendViaRF             = request->hasParam("beacon.sendViaRF", true);
+        Config.beacon.beaconFreq            = getParamIntSafe("beacon.beaconFreq", Config.beacon.beaconFreq);
         Config.beacon.latitude              = getParamDoubleSafe("beacon.latitude", Config.beacon.latitude);
         Config.beacon.longitude             = getParamDoubleSafe("beacon.longitude", Config.beacon.longitude);
         Config.beacon.comment               = getParamStringSafe("beacon.comment", Config.beacon.comment);
@@ -196,15 +199,19 @@ namespace WEB_Utils {
 
         Config.digi.mode                    = getParamIntSafe("digi.mode", Config.digi.mode);
         Config.digi.ecoMode                 = getParamIntSafe("digi.ecoMode", Config.digi.ecoMode);
+        
 
-        Config.loramodule.txFreq            = getParamIntSafe("lora.txFreq", Config.loramodule.txFreq);
-        Config.loramodule.rxFreq            = getParamIntSafe("lora.rxFreq", Config.loramodule.rxFreq);
-        Config.loramodule.spreadingFactor   = getParamIntSafe("lora.spreadingFactor", Config.loramodule.spreadingFactor);
-        Config.loramodule.signalBandwidth   = getParamIntSafe("lora.signalBandwidth", Config.loramodule.signalBandwidth);
-        Config.loramodule.codingRate4       = getParamIntSafe("lora.codingRate4", Config.loramodule.codingRate4);
-        Config.loramodule.power             = getParamIntSafe("lora.power", Config.loramodule.power);
-        Config.loramodule.txActive          = request->hasParam("lora.txActive", true);
         Config.loramodule.rxActive          = request->hasParam("lora.rxActive", true);
+        Config.loramodule.rxFreq            = getParamIntSafe("lora.rxFreq", Config.loramodule.rxFreq);
+        Config.loramodule.rxSpreadingFactor = getParamIntSafe("lora.rxSpreadingFactor", Config.loramodule.rxSpreadingFactor);
+        Config.loramodule.rxCodingRate4     = getParamIntSafe("lora.rxCodingRate4", Config.loramodule.rxCodingRate4);
+        Config.loramodule.rxSignalBandwidth = getParamIntSafe("lora.rxSignalBandwidth", Config.loramodule.rxSignalBandwidth);
+        Config.loramodule.txActive          = request->hasParam("lora.txActive", true);
+        Config.loramodule.txFreq            = getParamIntSafe("lora.txFreq", Config.loramodule.txFreq);
+        Config.loramodule.txSpreadingFactor = getParamIntSafe("lora.txSpreadingFactor", Config.loramodule.txSpreadingFactor);
+        Config.loramodule.txCodingRate4     = getParamIntSafe("lora.txCodingRate4", Config.loramodule.txCodingRate4);
+        Config.loramodule.txSignalBandwidth = getParamIntSafe("lora.txSignalBandwidth", Config.loramodule.txSignalBandwidth);
+        Config.loramodule.power             = getParamIntSafe("lora.power", Config.loramodule.power);
 
 
         Config.display.alwaysOn             = request->hasParam("display.alwaysOn", true);
@@ -252,6 +259,7 @@ namespace WEB_Utils {
         Config.tnc.enableServer             = request->hasParam("tnc.enableServer", true);
         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.mqtt.active                  = request->hasParam("mqtt.active", true);
@@ -261,6 +269,7 @@ namespace WEB_Utils {
             Config.mqtt.username            = getParamStringSafe("mqtt.username", Config.mqtt.username);
             Config.mqtt.password            = getParamStringSafe("mqtt.password", Config.mqtt.password);
             Config.mqtt.port                = getParamIntSafe("mqtt.port", Config.mqtt.port);
+            Config.mqtt.beaconOverMqtt      = request->hasParam("mqtt.beaconOverMqtt", true);
         }