ready for testing

test with disabling boxes
many switches fix
2026-03-28 16:52:33 +01:00 · 2025-08-29 14:18:13 -04:00 · 2025-08-29 12:17:07 -04:00 · 2025-08-29 10:33:35 -04:00 · 2025-08-27 18:10:03 -04:00 · 2025-08-27 17:44:27 -04:00
21 changed files with 981 additions and 428 deletions
--- a/common_settings.ini
+++ b/common_settings.ini
@@ -33,9 +33,11 @@ lib_deps =
 	ayushsharma82/ElegantOTA @ 3.1.5
 	bblanchon/ArduinoJson @ 6.21.3
 	jgromes/RadioLib @ 7.1.0
+	knolleary/PubSubClient @ 2.8
 	mathieucarbou/AsyncTCP @ 3.2.5
 	mathieucarbou/ESPAsyncWebServer @ 3.2.3
-	mikalhart/TinyGPSPlus @ 1.0.3	
+	mikalhart/TinyGPSPlus @ 1.0.3
+	richonguzman/APRSPacketLib @1.0.0
 display_libs =
 	adafruit/Adafruit GFX Library @ 1.11.9
 	adafruit/Adafruit SSD1306 @ 2.5.10
--- a/data/igate_conf.json
+++ b/data/igate_conf.json
@@ -16,17 +16,21 @@
        "symbol": "a",
        "path": "WIDE1-1",
        "sendViaAPRSIS": false,
-        "sendViaRF": false
+        "sendViaRF": false,
+        "statusActive": false,
+        "statusPacket": ""
    },
    "aprs_is": {
        "active": false,
-        "passcode": "XYZVW",
-        "server": "rotate.aprs2.net",
-        "port": 14580,
-        "filter": "m/10",
        "messagesToRF": false,
-        "objectsToRF": false
+        "objectsToRF": false,
+        "server": "rotate.aprs2.net",
+        "passcode": "XYZVW",        
+        "port": 14580,
+        "filter": "m/10"        
    },
+    "personalNote": "",
+    "blacklist": "",
    "digi": {
        "mode": 0,
        "ecoMode": 0
@@ -66,13 +70,22 @@
    "syslog": {
        "active": false,
        "server": "lora.link9.net",
-        "port": 1514
+        "port": 1514,
+        "logBeaconOverTCPIP": false
    },
    "tnc": {
        "enableServer": false,
        "enableSerial": false,
        "acceptOwn": false
    },
+    "mqtt": {
+        "active": false,
+        "server": "",
+        "topic": "",
+        "username": "",
+        "password": "",
+        "port": 1883
+    },
    "ota": {
        "username": "",
        "password": ""
@@ -81,19 +94,17 @@
        "username": "admin",
        "password": ""
    },
-    "ntp": {
-        "gmtCorrection": 0.0
-    },
    "remoteManagement": {
        "managers": "",
        "rfOnly": true
-    },        
+    },
+    "ntp": {
+        "gmtCorrection": 0.0
+    },
    "other": {
        "rememberStationTime": 30,
        "backupDigiMode": false,
        "rebootMode": false,
        "rebootModeTime": 6
-    },
-    "personalNote": "",
-    "blacklist": ""
+    }
 }
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -253,7 +253,37 @@
                                            name="personalNote"
                                            id="personalNote"
                                            class="form-control"
-                                            placeholder="A Couple of words."
+                                            placeholder="A couple of words"
+                                        />
+                                    </div>
+                                    <div class="col-12 mt-3">
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="beacon.statusActive"
+                                                id="beacon.statusActive"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="beacon.statusActive"
+                                                class="form-label"
+                                                >Send Status at each Boot</label
+                                            >
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <label
+                                            for="beacon.statusPacket"
+                                            class="form-label"
+                                            >Status</label
+                                        >
+                                        <input
+                                            type="text"
+                                            name="beacon.statusPacket"
+                                            id="beacon.statusPacket"
+                                            class="form-control"
+                                            placeholder="Custom Status"
+                                            value=""
                                        />
                                    </div>
                                </div>
@@ -409,8 +439,9 @@
                                            type="text"
                                            name="aprs_is.server"
                                            id="aprs_is.server"
-                                            placeholder="soam.aprs2.net"
+                                            placeholder="rotate.aprs2.net"
                                            class="form-control"
+                                            value="rotate.aprs2.net"
                                        />
                                    </div>
                                    <div class="col-4">
@@ -425,6 +456,7 @@
                                            id="aprs_is.port"
                                            placeholder="14580"
                                            class="form-control"
+                                            value="14580"
                                        />
                                    </div>
                                </div>
@@ -440,6 +472,7 @@
                                            name="aprs_is.passcode"
                                            id="aprs_is.passcode"
                                            class="form-control"
+                                            value="XYZWV"
                                        />
                                    </div>
                                    <div class="col-4">
@@ -453,6 +486,7 @@
                                            class="form-control"
                                            name="aprs_is.filter"
                                            id="aprs_is.filter"
+                                            value="m/10"
                                        />
                                    </div>
                                </div>
@@ -661,7 +695,10 @@
                                        <label
                                            for="digi.ecoMode"
                                            class="form-label"
-                                            >Eco Mode</label
+                                            >Eco Mode
+                                            <small
+                                                >(Requires Digipeating enabled and APRS-IS connection disabled).</small
+                                            ></label
                                        >
                                        <select
                                            class="form-select form-select"
@@ -986,6 +1023,8 @@
                                                name="display.timeout"
                                                id="display.timeout"
                                                value="4"
+                                                step="1"
+                                                min="2"
                                                class="form-control"
                                            />
                                            <span class="input-group-text"
@@ -1245,9 +1284,9 @@
                                            <label
                                                for="wxsensor.active"
                                                class="form-label"
-                                                ><b>Activate Wx Telemetry</b>
+                                                >Activate Wx Telemetry
                                                <small
-                                                    >Requires a BME/BMP280, BME680 or Si7021 sensor.</small
+                                                    >(Requires a BME/BMP280, BME680 or Si7021 sensor).</small
                                                ></label
                                            >
                                        </div>
@@ -1347,7 +1386,6 @@
                                            id="syslog.server"
                                            placeholder="lora.link9.net"
                                            class="form-control"
-                                            disabled
                                        />
                                    </div>
                                    <div class="col-6">
@@ -1362,9 +1400,23 @@
                                            id="syslog.port"
                                            placeholder="1514"
                                            class="form-control"
-                                            disabled
                                        />
                                    </div>
+                                    <div class="col-6">
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="syslog.logBeaconOverTCPIP"
+                                                id="syslog.logBeaconOverTCPIP"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="syslog.logBeaconOverTCPIP"
+                                                class="form-label"
+                                                >Log Beacon over TPCIP</label
+                                            >
+                                        </div>
+                                    </div>
                                </div>
                            </div>
                        </div>
@@ -1455,6 +1507,142 @@
                        </div>
                        <hr>

+                        <div class="row my-5 d-flex align-items-top">
+                            <div class="col-lg-3 col-sm-12">
+                                <h5>
+                                    <svg
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        width="20"
+                                        height="20"
+                                        fill="currentColor"
+                                        class="bi bi-database-fill"
+                                        viewBox="0 0 16 16"
+                                    >
+                                        <path
+                                            d="M3.904 1.777C4.978 1.289 6.427 1 8 1s3.022.289 4.096.777C13.125 2.245 14 2.993 14 4s-.875 1.755-1.904 2.223C11.022 6.711 9.573 7 8 7s-3.022-.289-4.096-.777C2.875 5.755 2 5.007 2 4s.875-1.755 1.904-2.223"
+                                        />
+                                        <path
+                                            d="M2 6.161V7c0 1.007.875 1.755 1.904 2.223C4.978 9.71 6.427 10 8 10s3.022-.289 4.096-.777C13.125 8.755 14 8.007 14 7v-.839c-.457.432-1.004.751-1.49.972C11.278 7.693 9.682 8 8 8s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"
+                                        />
+                                        <path
+                                            d="M2 9.161V10c0 1.007.875 1.755 1.904 2.223C4.978 12.711 6.427 13 8 13s3.022-.289 4.096-.777C13.125 11.755 14 11.007 14 10v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"
+                                        />
+                                        <path
+                                            d="M2 12.161V13c0 1.007.875 1.755 1.904 2.223C4.978 15.711 6.427 16 8 16s3.022-.289 4.096-.777C13.125 14.755 14 14.007 14 13v-.839c-.457.432-1.004.751-1.49.972-1.232.56-2.828.867-4.51.867s-3.278-.307-4.51-.867c-.486-.22-1.033-.54-1.49-.972"
+                                        />
+                                    </svg>
+                                    MQTT
+                                </h5>
+                                <small>Set your MQTT server</small>
+                            </div>
+                            <div class="col-lg-9 col-sm-12">
+                                <div class="row">
+                                    <div class="col-12">
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="mqtt.active"
+                                                id="mqtt.active"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="mqtt.active"
+                                                class="form-label"
+                                                >Enable</label
+                                            >
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <label
+                                            for="mqtt.server"
+                                            class="form-label"
+                                            >Server</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="text"
+                                                name="mqtt.server"
+                                                id="mqtt.server"
+                                                class="form-control"
+                                            />
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <label
+                                            for="mqtt.topic"
+                                            class="form-label"
+                                            >Topic</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="text"
+                                                name="mqtt.topic"
+                                                id="mqtt.topic"
+                                                class="form-control"
+                                                placeholder="aprs-igate"
+                                            />
+                                        </div>
+                                        <div class="form-text">
+                                            Default is <strong>aprs-igate</strong>
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <label
+                                            for="mqtt.username"
+                                            class="form-label"
+                                            >Username</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="text"
+                                                name="mqtt.username"
+                                                id="mqtt.username"
+                                                class="form-control"
+                                            />
+                                        </div>
+                                    </div>
+                                    <div class="col-12 mt-3">
+                                        <label
+                                            for="mqtt.password"
+                                            class="form-label"
+                                            >Password</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="password"
+                                                name="mqtt.password"
+                                                id="mqtt.password"
+                                                class="form-control"
+                                            />
+                                        </div>
+                                    </div>
+                                    <div class="col-12 mt-3">
+                                        <label
+                                            for="mqtt.port"
+                                            class="form-label"
+                                            >Port</label
+                                        >
+                                        <div class="input-group">
+                                            <input
+                                                type="number"
+                                                name="mqtt.port"
+                                                id="mqtt.port"
+                                                class="form-control"
+                                                placeholder="1883"
+                                                required=""
+                                                step="1"
+                                                min="0"
+                                            />
+                                        </div>
+                                        <div class="form-text">
+                                            Default is <strong>1883</strong>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr>
+
                        <div class="row my-5 d-flex align-items-top">
                            <div class="col-lg-3 col-sm-12">
                                <h5>
@@ -1889,7 +2077,7 @@
                                d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0M5.408 5.89c.681 0 1.138.47 1.187 1.107h1.147v-.11c-.053-1.187-1.024-2-2.343-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.906 2.73 2.518 2.73 1.314 0 2.285-.792 2.343-1.939v-.114H6.595c-.049.615-.497 1.05-1.187 1.05-.84 0-1.318-.62-1.318-1.727v-.742c0-1.112.488-1.754 1.318-1.754Zm5.404 0c.68 0 1.138.47 1.186 1.107h1.147v-.11c-.053-1.187-1.024-2-2.342-2-1.604 0-2.518 1.05-2.518 2.751v.747c0 1.7.905 2.73 2.518 2.73 1.314 0 2.285-.792 2.342-1.939v-.114h-1.147c-.048.615-.496 1.05-1.186 1.05-.84 0-1.319-.62-1.319-1.727v-.742c0-1.112.488-1.754 1.319-1.754Z"
                            />
                        </svg>
-                        2023-24
+                        2023-25
                        <b
                            ><a href="https://github.com/richonguzman"
                                >CA2RXU</a
--- a/data_embed/script.js
+++ b/data_embed/script.js
@@ -49,27 +49,6 @@ function fetchSettings() {
        });
 }

-const alwaysOnCheckbox = document.querySelector(
-    'input[name="display.alwaysOn"]'
-);
-const timeoutInput = document.querySelector('input[name="display.timeout"]');
-
-alwaysOnCheckbox.addEventListener("change", function () {
-    timeoutInput.disabled = this.checked;
-});
-
-// timeoutInput.addEventListener("change", function () {
-//     alwaysOnCheckbox.disabled = this.value !== "";
-// });
-
-const logCheckbox = document.querySelector('input[name="syslog.active"]');
-const serverField = document.querySelector('input[name="syslog.server"]');
-const portField = document.querySelector('input[name="syslog.port"]');
-
-logCheckbox.addEventListener("change", function () {
-    serverField.disabled = !this.checked;
-    portField.disabled = !this.checked;
-});

 function loadSettings(settings) {
    currentSettings = settings;
@@ -125,6 +104,13 @@ function loadSettings(settings) {
    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;
+    APRSISCheckbox.checked      = settings.aprs_is.active;
+    APRSISGateMessages.disabled = !APRSISCheckbox.checked;
+    APRSISGateObjects.disabled  = !APRSISCheckbox.checked;
+    APRSISServer.disabled       = !APRSISCheckbox.checked;
+    APRSISPort.disabled         = !APRSISCheckbox.checked;
+    APRSISPasscode.disabled     = !APRSISCheckbox.checked;
+    APRSISFilter.disabled       = !APRSISCheckbox.checked;

    // Beacon
    document.getElementById("beacon.latitude").value                    = settings.beacon.latitude;
@@ -134,6 +120,11 @@ function loadSettings(settings) {
    document.getElementById("beacon.sendViaAPRSIS").checked             = settings.beacon.sendViaAPRSIS;
    document.getElementById("beacon.sendViaRF").checked                 = settings.beacon.sendViaRF;

+    document.getElementById("beacon.statusActive").checked              = settings.beacon.statusActive;
+    document.getElementById("beacon.statusPacket").value                = settings.beacon.statusPacket;
+    StatusCheckbox.checked  = settings.beacon.statusActive;
+    StatusPacket.disabled   = !StatusCheckbox.checked;
+
    document.getElementById("beacon.gpsActive").checked                 = settings.beacon.gpsActive;
    document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;

@@ -142,7 +133,7 @@ function loadSettings(settings) {

    // Digi
    document.getElementById("digi.mode").value                          = settings.digi.mode;
-    document.getElementById("digi.ecoMode").checked                     = settings.digi.ecoMode;
+    document.getElementById("digi.ecoMode").value                       = settings.digi.ecoMode;

    // LoRa
    document.getElementById("lora.txFreq").value                        = settings.lora.txFreq;
@@ -158,38 +149,50 @@ function loadSettings(settings) {
    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;
-    }
+    DisplayAlwaysOnCheckbox.checked = settings.display.alwaysOn;
+    DisplayTimeout.disabled         = DisplayAlwaysOnCheckbox.checked;

    // BATTERY
    document.getElementById("battery.sendInternalVoltage").checked      = settings.battery.sendInternalVoltage;
    document.getElementById("battery.monitorInternalVoltage").checked   = settings.battery.monitorInternalVoltage;
    document.getElementById("battery.internalSleepVoltage").value       = settings.battery.internalSleepVoltage.toFixed(1);
+    MonitorInternalVoltageCheckbox.checked  = settings.battery.monitorInternalVoltage;
+    MonitorInternalSleepVoltage.disabled    = !MonitorInternalVoltageCheckbox.checked;
+
    document.getElementById("battery.sendExternalVoltage").checked      = settings.battery.sendExternalVoltage;
    document.getElementById("battery.externalVoltagePin").value         = settings.battery.externalVoltagePin;
    document.getElementById("battery.voltageDividerR1").value           = settings.battery.voltageDividerR1.toFixed(1);
    document.getElementById("battery.voltageDividerR2").value           = settings.battery.voltageDividerR2.toFixed(1);
+    SendExternalVoltageCheckbox.checked     = settings.battery.sendExternalVoltage;
+    ExternalVoltagePin.disabled             = !SendExternalVoltageCheckbox.checked;
+    ExternalVoltageDividerR1.disabled       = !SendExternalVoltageCheckbox.checked;
+    ExternalVoltageDividerR2.disabled       = !SendExternalVoltageCheckbox.checked;
+
    document.getElementById("battery.monitorExternalVoltage").checked   = settings.battery.monitorExternalVoltage;
    document.getElementById("battery.externalSleepVoltage").value       = settings.battery.externalSleepVoltage.toFixed(1);
+    MonitorExternalVoltageCheckbox.checked  = settings.battery.monitorExternalVoltage;
+    MonitorExternalSleepVoltage.disabled    = !MonitorExternalVoltageCheckbox.checked;
+
    document.getElementById("battery.sendVoltageAsTelemetry").checked   = settings.battery.sendVoltageAsTelemetry;
-    
+
    // TELEMETRY WX SENSOR
    document.getElementById("wxsensor.active").checked                  = settings.wxsensor.active;
    document.getElementById("wxsensor.heightCorrection").value          = settings.wxsensor.heightCorrection;
    document.getElementById("wxsensor.temperatureCorrection").value     = settings.wxsensor.temperatureCorrection.toFixed(1);
+    TelemetryCheckbox.checked           = settings.wxsensor.active;
+    TelemetryHeightCorrection.disabled  = !TelemetryCheckbox.checked;
+    TelemetryTempCorrection.disabled    = !TelemetryCheckbox.checked;
    
    // 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;
-
-    if (settings.syslog.active) {
-        serverField.disabled = false;
-        portField.disabled = false;
-    }
-
+    document.getElementById("syslog.logBeaconOverTCPIP").checked        = settings.syslog.logBeaconOverTCPIP;
+    SyslogCheckbox.checked          = settings.syslog.active;
+    SyslogServer.disabled           = !SyslogCheckbox.checked;
+    SyslogPort.disabled             = !SyslogCheckbox.checked;
+    SyslogBeaconOverTCPIP.disabled  = !SyslogCheckbox.checked;
+    
    // TNC
    if (settings.tnc) {
        document.getElementById("tnc.enableServer").checked             = settings.tnc.enableServer;
@@ -197,9 +200,25 @@ function loadSettings(settings) {
        document.getElementById("tnc.acceptOwn").checked                = settings.tnc.acceptOwn;
    }

+    // MQTT
+    document.getElementById("mqtt.active").checked                      = settings.mqtt.active;
+    document.getElementById("mqtt.server").value                        = settings.mqtt.server;
+    document.getElementById("mqtt.topic").value                         = settings.mqtt.topic;
+    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;
+    MqttServer.disabled     = !MqttCheckbox.check;
+    MqttTopic.disabled      = !MqttCheckbox.check;
+    MqttUsername.disabled   = !MqttCheckbox.check;
+    MqttPassword.disabled   = !MqttCheckbox.check;
+    MqttPort.disabled       = !MqttCheckbox.check;
+
    // Reboot
    document.getElementById("other.rebootMode").checked                 = settings.other.rebootMode;
    document.getElementById("other.rebootModeTime").value               = settings.other.rebootModeTime;
+    RebootModeCheckbox.checked  = settings.other.rebootMode;
+    RebootModeTime.disabled     = !RebootModeCheckbox.check;

    // WiFi Auto AP
    document.getElementById("wifi.autoAP.password").value               = settings.wifi.autoAP.password;
@@ -213,6 +232,13 @@ function loadSettings(settings) {
    document.getElementById("webadmin.active").checked                  = settings.webadmin.active;
    document.getElementById("webadmin.username").value                  = settings.webadmin.username;
    document.getElementById("webadmin.password").value                  = settings.webadmin.password;
+    WebadminCheckbox.checked    = settings.webadmin.active;
+    WebadminUsername.disabled   = !WebadminCheckbox.check;
+    WebadminPassword.disabled   = !WebadminCheckbox.check;
+
+    // Management over APRS
+    document.getElementById("remoteManagement.managers").value          = settings.remoteManagement.managers;
+    document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;

    // NTP
    document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
@@ -220,13 +246,8 @@ function loadSettings(settings) {
    // Experimental
    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;

-    // Management over APRS
-    document.getElementById("remoteManagement.managers").value          = settings.remoteManagement.managers;
-    document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
-
    updateImage();
    refreshSpeedStandard();
-    toggleFields();
 }

 function showToast(message) {
@@ -253,8 +274,6 @@ document.getElementById('reboot').addEventListener('click', function (e) {
    showToast("Your device will be rebooted in a while");
 });

-const wxsensorCheckbox = document.querySelector("input[name='wxsensor.active']");
-
 function updateImage() {
    const value = document.getElementById("beacon.overlay").value + document.getElementById("beacon.symbol").value;

@@ -280,70 +299,111 @@ function updateImage() {
    }
 }

-function toggleFields() {
-    const sendExternalVoltageCheckbox = document.querySelector(
-        'input[name="battery.sendExternalVoltage"]'
-    );
-    const externalVoltagePinInput = document.querySelector(
-        'input[name="battery.externalVoltagePin"]'
-    );

-    externalVoltagePinInput.disabled = !sendExternalVoltageCheckbox.checked;
-    voltageDividerR1.disabled = !sendExternalVoltageCheckbox.checked;
-    voltageDividerR2.disabled = !sendExternalVoltageCheckbox.checked;
-
-    const WebadminCheckbox = document.querySelector(
-        'input[name="webadmin.active"]'
-    );
-
-    const WebadminUsername = document.querySelector(
-        'input[name="webadmin.username"]'
-    );
-
-    const WebadminPassword = document.querySelector(
-        'input[name="webadmin.password"]'
-    );
-    WebadminUsername.disabled = !WebadminCheckbox.checked;
-    WebadminPassword.disabled = !WebadminCheckbox.checked;
-}
-
-const sendExternalVoltageCheckbox = document.querySelector(
-    'input[name="battery.sendExternalVoltage"]'
-);
-const externalVoltagePinInput = document.querySelector(
-    'input[name="battery.externalVoltagePin"]'
-);
-
-const voltageDividerR1 = document.querySelector(
-    'input[name="battery.voltageDividerR1"]'
-);
-
-const voltageDividerR2 = document.querySelector(
-    'input[name="battery.voltageDividerR2"]'
-);
-
-sendExternalVoltageCheckbox.addEventListener("change", function () {
-    externalVoltagePinInput.disabled = !this.checked;
-    voltageDividerR1.disabled = !this.checked;
-    voltageDividerR2.disabled = !this.checked;
+// Status Switch
+const StatusCheckbox            = document.querySelector('input[name="beacon.statusActive"]');
+const StatusPacket              = document.querySelector('input[name="beacon.statusPacket"]');
+StatusCheckbox.addEventListener("change", function() {
+    StatusPacket.disabled       = !this.checked;
 });

-const WebadminCheckbox = document.querySelector(
-    'input[name="webadmin.active"]'
-);
+// APRS-IS Switches
+const APRSISCheckbox            = document.querySelector('input[name="aprs_is.active"]');
+const APRSISGateMessages        = document.querySelector('input[name="aprs_is.messagesToRF"]');
+const APRSISGateObjects         = document.querySelector('input[name="aprs_is.objectsToRF"]');
+const APRSISServer              = document.querySelector('input[name="aprs_is.server"]');
+const APRSISPort                = document.querySelector('input[name="aprs_is.port"]');
+const APRSISPasscode            = document.querySelector('input[name="aprs_is.passcode"]');
+const APRSISFilter              = document.querySelector('input[name="aprs_is.filter"]');
+APRSISCheckbox.addEventListener("change", function() {
+    APRSISGateMessages.disabled = !this.checked;
+    APRSISGateObjects.disabled  = !this.checked;
+    APRSISServer.disabled       = !this.checked;
+    APRSISPort.disabled         = !this.checked;
+    APRSISPasscode.disabled     = !this.checked;
+    APRSISFilter.disabled       = !this.checked;
+});

-const WebadminUsername = document.querySelector(
-    'input[name="webadmin.username"]'
-);
+// Display Switches
+const DisplayAlwaysOnCheckbox   = document.querySelector('input[name="display.alwaysOn"]');
+const DisplayTimeout            = document.querySelector('input[name="display.timeout"]');
+DisplayAlwaysOnCheckbox.addEventListener("change", function () {
+    DisplayTimeout.disabled     = this.checked;
+});

-const WebadminPassword = document.querySelector(
-    'input[name="webadmin.password"]'
-);
+// Battery Switches
+const MonitorInternalVoltageCheckbox        = document.querySelector('input[name="battery.monitorInternalVoltage"]');
+const MonitorInternalSleepVoltage           = document.querySelector('input[name="battery.internalSleepVoltage"]');
+MonitorInternalVoltageCheckbox.addEventListener("change", function () {
+    MonitorInternalSleepVoltage.disabled    = !this.checked;
+});
+const MonitorExternalVoltageCheckbox        = document.querySelector('input[name="battery.monitorExternalVoltage"]');
+const MonitorExternalSleepVoltage           = document.querySelector('input[name="battery.externalSleepVoltage"]');
+MonitorExternalVoltageCheckbox.addEventListener("change", function () {
+    MonitorExternalSleepVoltage.disabled    = !this.checked;
+});
+const SendExternalVoltageCheckbox           = document.querySelector('input[name="battery.sendExternalVoltage"]');
+const ExternalVoltagePin                    = document.querySelector('input[name="battery.externalVoltagePin"]');
+const ExternalVoltageDividerR1              = document.querySelector('input[name="battery.voltageDividerR1"]');
+const ExternalVoltageDividerR2              = document.querySelector('input[name="battery.voltageDividerR2"]');
+SendExternalVoltageCheckbox.addEventListener("change", function () {
+    ExternalVoltagePin.disabled             = !this.checked;
+    ExternalVoltageDividerR1.disabled       = !this.checked;
+    ExternalVoltageDividerR2.disabled       = !this.checked;
+});
+
+// Telemetry Switches
+const TelemetryCheckbox                 = document.querySelector('input[name="wxsensor.active"]');
+const TelemetryHeightCorrection         = document.querySelector('input[name="wxsensor.heightCorrection"]');
+const TelemetryTempCorrection           = document.querySelector('input[name="wxsensor.temperatureCorrection"]');
+TelemetryCheckbox.addEventListener("change", function () {
+    TelemetryHeightCorrection.disabled  = !this.checked;
+    TelemetryTempCorrection.disabled    = !this.checked;
+});
+
+// Syslog Switches
+const SyslogCheckbox                = document.querySelector('input[name="syslog.active"]');
+const SyslogServer                  = document.querySelector('input[name="syslog.server"]');
+const SyslogPort                    = document.querySelector('input[name="syslog.port"]');
+const SyslogBeaconOverTCPIP         = document.querySelector('input[name="syslog.logBeaconOverTCPIP"]');
+SyslogCheckbox.addEventListener("change", function () {
+    SyslogServer.disabled           = !this.checked;
+    SyslogPort.disabled             = !this.checked;
+    SyslogBeaconOverTCPIP.disabled  = !this.checked
+});
+
+// MQTT Switches
+const MqttCheckbox              = document.querySelector('input[name="mqtt.active"]');
+const MqttServer                = document.querySelector('input[name="mqtt.server"]');
+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"]');
+MqttCheckbox.addEventListener("change", function () {
+    MqttServer.disabled         = !this.checked;
+    MqttTopic.disabled          = !this.checked;
+    MqttUsername.disabled       = !this.checked;
+    MqttPassword.disabled       = !this.checked;
+    MqttPort.disabled           = !this.checked;
+});
+
+// Reboot Switches
+const RebootModeCheckbox        = document.querySelector('input[name="other.rebootMode"]');
+const RebootModeTime            = document.querySelector('input[name="other.rebootModeTime"]');
+RebootModeCheckbox.addEventListener("change", function() {
+    RebootModeTime.disabled     = !this.checked;
+});
+
+// Web Admin Switches
+const WebadminCheckbox          = document.querySelector('input[name="webadmin.active"]');
+const WebadminUsername          = document.querySelector('input[name="webadmin.username"]');
+const WebadminPassword          = document.querySelector('input[name="webadmin.password"]');
 WebadminCheckbox.addEventListener("change", function () {
-    WebadminUsername.disabled = !this.checked;
-    WebadminPassword.disabled = !this.checked;
+    WebadminUsername.disabled   = !this.checked;
+    WebadminPassword.disabled   = !this.checked;
 });

+
 document.querySelector(".new button").addEventListener("click", function () {
    const networksContainer = document.querySelector(".list-networks");

--- a/include/battery_utils.h
+++ b/include/battery_utils.h
@@ -32,9 +32,6 @@ namespace BATTERY_Utils {
    float   checkExternalVoltage();
    void    startupBatteryHealth();

-    String  generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType);
-    String  generateEncodedTelemetry();
-
 }

 #endif
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -49,6 +49,8 @@ public:
    bool    sendViaAPRSIS;
    bool    gpsActive;
    bool    gpsAmbiguity;
+    bool    statusActive;
+    String  statusPacket;
 };

 class APRS_IS {
@@ -113,6 +115,7 @@ public:
    bool    active;
    String  server;
    int     port;
+    bool    logBeaconOverTCPIP;
 };

 class TNC {
@@ -146,6 +149,16 @@ public:
    bool    rfOnly;
 };

+class MQTT {
+public:
+    bool    active;
+    String  server;
+    String  topic;
+    String  username;
+    String  password;
+    int     port;
+};
+
 class Configuration {
 public:
    String                  callsign;
@@ -170,6 +183,7 @@ public:
    WEBADMIN                webadmin;
    NTP                     ntp;    
    REMOTE_MANAGEMENT       remoteManagement;
+    MQTT                    mqtt;

    void init();
    void writeFile();
--- a/include/mqtt_utils.h
+++ b/include/mqtt_utils.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ * 
+ * This file is part of LoRa APRS iGate.
+ * 
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef MQTT_UTILS_H_
+#define MQTT_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace MQTT_Utils {
+
+    void sendToMqtt(const String& packet);
+    void connect();
+    void loop();
+    void setup();
+
+}
+
+ #endif
--- a/include/power_utils.h
+++ b/include/power_utils.h
@@ -29,9 +29,18 @@

 namespace POWER_Utils {

+    #ifdef VEXT_CTRL
+        void vext_ctrl_ON();
+        void vext_ctrl_OFF();
+    #endif
+
+    #ifdef ADC_CTRL
+        void adc_ctrl_ON();
+        void adc_ctrl_OFF();
+    #endif
+
    double  getBatteryVoltage();
    bool    isBatteryConnected();
-    void    activateMeasurement();
    void    activateGPS();
    void    deactivateGPS();
    void    activateLoRa();
--- a/include/telemetry_utils.h
+++ b/include/telemetry_utils.h
@@ -0,0 +1,33 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ * 
+ * This file is part of LoRa APRS iGate.
+ * 
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef TELEMETRY_UTILS_H_
+#define TELEMETRY_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace TELEMETRY_Utils {
+
+    void    sendEquationsUnitsParameters();
+    String  generateEncodedTelemetryBytes(float value, bool counterBytes, byte telemetryType);
+    String  generateEncodedTelemetry();
+    
+}
+
+#endif
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -51,6 +51,7 @@ ___________________________________________________________________*/
 #include "syslog_utils.h"
 #include "power_utils.h"
 #include "sleep_utils.h"
+#include "mqtt_utils.h"
 #include "lora_utils.h"
 #include "wifi_utils.h"
 #include "digi_utils.h"
@@ -66,9 +67,10 @@ ___________________________________________________________________*/
 #endif


-String              versionDate             = "2025-06-20";
+String              versionDate             = "2025-08-29";
 Configuration       Config;
-WiFiClient          espClient;
+WiFiClient          aprsIsClient;
+WiFiClient          mqttClient;
 #ifdef HAS_GPS
    HardwareSerial  gpsSerial(1);
    TinyGPSPlus     gps;
@@ -118,6 +120,7 @@ void setup() {
    WX_Utils::setup();
    WEB_Utils::setup();
    TNC_Utils::setup();
+    MQTT_Utils::setup();
    #ifdef HAS_A7670
        A7670_Utils::setup();
    #endif
@@ -166,11 +169,13 @@ void loop() {
            if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
        #else
            WIFI_Utils::checkWiFi();
-            if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
+            if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !aprsIsClient.connected()) APRS_IS_Utils::connect();
+            if (Config.mqtt.active && (WiFi.status() == WL_CONNECTED) && !mqttClient.connected()) MQTT_Utils::connect();
        #endif

        NTP_Utils::update();
        TNC_Utils::loop();
+        MQTT_Utils::loop();

        Utils::checkDisplayInterval();
        Utils::checkBeaconInterval();
@@ -183,7 +188,7 @@ void loop() {
        }

        if (packet != "") {
-            if (Config.aprs_is.active) { // If APRSIS enabled
+            if (Config.aprs_is.active) {    // If APRSIS enabled
                APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
            }

@@ -192,17 +197,12 @@ void loop() {
                DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
            }

-            if (Config.tnc.enableServer) { // If TNC server enabled
-                TNC_Utils::sendToClients(packet); // Send received packet to TNC KISS
-            }
-            if (Config.tnc.enableSerial) { // If Serial KISS enabled
-                TNC_Utils::sendToSerial(packet); // Send received packet to Serial KISS
-            }
+            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
+            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
-        }
+        if (Config.aprs_is.active) APRS_IS_Utils::listenAPRSIS();           // listen received packet from APRSIS

        STATION_Utils::processOutputPacketBuffer();

--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -30,7 +30,7 @@


 extern Configuration        Config;
-extern WiFiClient           espClient;
+extern WiFiClient           aprsIsClient;
 extern uint32_t             lastScreenOn;
 extern String               firstLine;
 extern String               secondLine;
@@ -53,17 +53,17 @@ bool        passcodeValid   = false;
 namespace APRS_IS_Utils {

    void upload(const String& line) {
-        espClient.print(line + "\r\n");
+        aprsIsClient.print(line + "\r\n");
    }

    void connect() {
        Serial.print("Connecting to APRS-IS ...     ");
        uint8_t count = 0;
-        while (!espClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
+        while (!aprsIsClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
            Serial.println("Didn't connect with server...");
            delay(1000);
-            espClient.stop();
-            espClient.flush();
+            aprsIsClient.stop();
+            aprsIsClient.flush();
            Serial.println("Run client.stop");
            Serial.println("Trying to connect with Server: " + String(Config.aprs_is.server) + " AprsServerPort: " + String(Config.aprs_is.port));
            count++;
@@ -110,7 +110,7 @@ namespace APRS_IS_Utils {
                    aprsisState = "--";
                }
            #else
-                if (espClient.connected()) {
+                if (aprsIsClient.connected()) {
                    aprsisState = "OK";
                } else {
                    aprsisState = "--";
@@ -192,7 +192,7 @@ namespace APRS_IS_Utils {
    }

    void processLoRaPacket(const String& packet) {
-        if (passcodeValid && (espClient.connected() || modemLoggedToAPRSIS)) {
+        if (passcodeValid && (aprsIsClient.connected() || modemLoggedToAPRSIS)) {
            if (packet.indexOf("NOGATE") == -1 && packet.indexOf("RFONLY") == -1) {
                int firstColonIndex = packet.indexOf(":");
                if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
@@ -371,9 +371,9 @@ namespace APRS_IS_Utils {
        #ifdef HAS_A7670
            A7670_Utils::listenAPRSIS();
        #else
-            if (espClient.connected()) {
-                if (espClient.available()) {
-                    String aprsisPacket = espClient.readStringUntil('\r');
+            if (aprsIsClient.connected()) {
+                if (aprsIsClient.available()) {
+                    String aprsisPacket = aprsIsClient.readStringUntil('\r');
                    aprsisPacket.trim();    // Serial.println(aprsisPacket);
                    processAPRSISPacket(aprsisPacket);
                    lastRxTime = millis();
@@ -383,7 +383,7 @@ namespace APRS_IS_Utils {
    }

    void firstConnection() {
-        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !aprsIsClient.connected()) {
            connect();
            while (!passcodeValid) {
                listenAPRSIS();
--- a/src/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -30,13 +30,13 @@ extern  uint32_t                        lastBatteryCheck;
 bool    shouldSleepLowVoltage           = false;

 float   adcReadingTransformation        = (3.3/4095);
+int     adcReadings                     = 20;
 float   voltageDividerCorrection        = 0.288;
 float   readingCorrection               = 0.125;
 float   multiplyCorrection              = 0.035;

 float   voltageDividerTransformation    = 0.0;

-int     telemetryCounter                = random(1,999);


 #ifdef HAS_ADC_CALIBRATION
@@ -117,69 +117,58 @@ namespace BATTERY_Utils {
                return 0.0;
            }
        #else
-            int sample;
-            int sampleSum = 0;
+            
            #ifdef ADC_CTRL
-                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
-                    digitalWrite(ADC_CTRL, HIGH);
-                #endif
-                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
-                    digitalWrite(ADC_CTRL, LOW);
-                #endif
+                POWER_Utils::adc_ctrl_ON();
            #endif

-            for (int i = 0; i < 100; i++) {
+            int sampleSum = 0;
+            for (int i = 0; i < adcReadings; i++) {
                #if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
-                    sample = 0;
+                    sampleSum = 0;
                #else
                    #ifdef HAS_ADC_CALIBRATION
                        if (calibrationEnable){
-                            sample = adc1_get_raw(InternalBattery_ADC_Channel);
+                            sampleSum += adc1_get_raw(InternalBattery_ADC_Channel);
                        } else {
-                            sample = analogRead(BATTERY_PIN);
+                            sampleSum += analogRead(BATTERY_PIN);
                        }
                    #else
                        #ifdef BATTERY_PIN
-                            sample = analogRead(BATTERY_PIN);
+                            sampleSum += analogRead(BATTERY_PIN);
                        #else
-                            sample = 0;
+                            sampleSum += 0;
                        #endif
                    #endif
                #endif
-                sampleSum += sample;
-                delayMicroseconds(50); 
+                delay(3); 
            }

            #ifdef ADC_CTRL
-                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
-                    digitalWrite(ADC_CTRL, LOW);
-                #endif
-                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
-                    digitalWrite(ADC_CTRL, HIGH);
-                #endif
+                POWER_Utils::adc_ctrl_OFF();

                #ifdef HELTEC_WP
                double inputDivider = (1.0 / (10.0 + 10.0)) * 10.0;  // The voltage divider is a 10k + 10k resistor in series
                #else
                double inputDivider = (1.0 / (390.0 + 100.0)) * 100.0;  // The voltage divider is a 390k + 100k resistor in series, 100k on the low side.
                #endif
-                return (((sampleSum/100) * adcReadingTransformation) / inputDivider) + 0.285; // Yes, this offset is excessive, but the ADC on the ESP32s3 is quite inaccurate and noisy. Adjust to own measurements.
+                return (((sampleSum/adcReadings) * adcReadingTransformation) / inputDivider) + 0.285; // Yes, this offset is excessive, but the ADC on the ESP32s3 is quite inaccurate and noisy. Adjust to own measurements.
            #else
                #ifdef HAS_ADC_CALIBRATION
                    if (calibrationEnable){
-                        float voltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars);
+                        float voltage = esp_adc_cal_raw_to_voltage(sampleSum / adcReadings, &adc_chars);
                        voltage *= 2;       // for 100K/100K voltage divider
                        voltage /= 1000;
                        return voltage;
                    } else {
-                        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                        return (2 * (sampleSum/adcReadings) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
                    }
                #else
                    #ifdef LIGHTGATEWAY_PLUS_1_0
                        double inputDivider = (1.0 / (560.0 + 100.0)) * 100.0;  // The voltage divider is a 560k + 100k resistor in series, 100k on the low side.
-                        return (((sampleSum/100) * adcReadingTransformation) / inputDivider) + 0.41;
+                        return (((sampleSum/adcReadings) * adcReadingTransformation) / inputDivider) + 0.41;
                    #else
-                        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                        return (2 * (sampleSum/adcReadings) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
                    #endif
                #endif
            #endif
@@ -237,43 +226,4 @@ namespace BATTERY_Utils {
        }
    }

-    String generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType) {  // 0 = internal battery(0-4,2V) , 1 = external battery(0-15V)
-        String encodedBytes;
-        int tempValue;
-
-        if (firstBytes) {
-            tempValue = value;
-        } else {
-            switch (voltageType) {
-                case 0:
-                    tempValue = value * 100;           // Internal voltage calculation
-                    break;
-                case 1:
-                    tempValue = (value * 100) / 2;     // External voltage calculation
-                    break;
-                default:
-                    tempValue = value;
-                    break;
-            }
-        }
-
-        int firstByte   = tempValue / 91;
-        tempValue       -= firstByte * 91;
-
-        encodedBytes    = char(firstByte + 33);
-        encodedBytes    += char(tempValue + 33);
-        return encodedBytes;
-    }
-
-    String generateEncodedTelemetry() {
-        String telemetry = "|";
-        telemetry += generateEncodedTelemetryBytes(telemetryCounter, true, 0);
-        telemetryCounter++;
-        if (telemetryCounter == 1000) telemetryCounter = 0;
-        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(checkInternalVoltage(), false, 0);
-        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(checkExternalVoltage(), false, 1);
-        telemetry += "|";
-        return telemetry;
-    }
-
 }
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -62,9 +62,16 @@ void Configuration::writeFile() {
    data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
    data["beacon"]["path"]                      = beacon.path;

+    data["beacon"]["statusActive"]              = beacon.statusActive;
+    data["beacon"]["statusPacket"]              = beacon.statusPacket;
+
    data["beacon"]["gpsActive"]                 = beacon.gpsActive;
    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;

+    data["personalNote"]                        = personalNote;
+
+    data["blacklist"]                           = blacklist;
+
    data["digi"]["mode"]                        = digi.mode;
    data["digi"]["ecoMode"]                     = digi.ecoMode;
    #if defined(HAS_A7670)
@@ -104,34 +111,38 @@ void Configuration::writeFile() {
    data["syslog"]["active"]                    = syslog.active;
    data["syslog"]["server"]                    = syslog.server;
    data["syslog"]["port"]                      = syslog.port;
+    data["syslog"]["logBeaconOverTCPIP"]        = syslog.logBeaconOverTCPIP;

    data["tnc"]["enableServer"]                 = tnc.enableServer;
    data["tnc"]["enableSerial"]                 = tnc.enableSerial;
    data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;

-    data["other"]["rebootMode"]                 = rebootMode;
-    data["other"]["rebootModeTime"]             = rebootModeTime;
+    data["mqtt"]["active"]                      = mqtt.active;
+    data["mqtt"]["server"]                      = mqtt.server;
+    data["mqtt"]["topic"]                       = mqtt.topic;
+    data["mqtt"]["username"]                    = mqtt.username;
+    data["mqtt"]["password"]                    = mqtt.password;
+    data["mqtt"]["port"]                        = mqtt.port;

    data["ota"]["username"]                     = ota.username;
    data["ota"]["password"]                     = ota.password;

-    data["other"]["rememberStationTime"]        = rememberStationTime;
-
-    data["other"]["backupDigiMode"]             = backupDigiMode;
-
-    data["personalNote"]                        = personalNote;
-
-    data["blacklist"]                           = blacklist;
-
    data["webadmin"]["active"]                  = webadmin.active;
    data["webadmin"]["username"]                = webadmin.username;
    data["webadmin"]["password"]                = webadmin.password;

-    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
-
    data["remoteManagement"]["managers"]        = remoteManagement.managers;
    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;

+    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+
+    data["other"]["rebootMode"]                 = rebootMode;
+    data["other"]["rebootModeTime"]             = rebootModeTime;
+
+    data["other"]["rememberStationTime"]        = rememberStationTime;
+
+    data["other"]["backupDigiMode"]             = backupDigiMode;
+
    serializeJson(data, configFile);

    configFile.close();
@@ -166,7 +177,16 @@ bool Configuration::readFile() {
        wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;

        callsign                        = data["callsign"] | "NOCALL-10";
-        rememberStationTime             = data["other"]["rememberStationTime"] | 30;
+        
+
+        aprs_is.active                  = data["aprs_is"]["active"] | false;
+        aprs_is.passcode                = data["aprs_is"]["passcode"] | "XYZWV";
+        aprs_is.server                  = data["aprs_is"]["server"] | "rotate.aprs2.net";
+        aprs_is.port                    = data["aprs_is"]["port"] | 14580;
+        aprs_is.filter                  = data["aprs_is"]["filter"] | "m/10";
+        aprs_is.messagesToRF            = data["aprs_is"]["messagesToRF"] | false;
+        aprs_is.objectsToRF             = data["aprs_is"]["objectsToRF"] | false;
+

        beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
        beacon.longitude                = data["beacon"]["longitude"] | 0.0;
@@ -177,17 +197,16 @@ bool Configuration::readFile() {
        beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
        beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
        beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
+        
+        beacon.statusActive             = data["beacon"]["statusActive"] | false;
+        beacon.statusPacket             = data["beacon"]["statusPacket"] | "";

        beacon.gpsActive                = data["beacon"]["gpsActive"] | false;
        beacon.gpsAmbiguity             = data["beacon"]["gpsAmbiguity"] | false;

-        aprs_is.active                  = data["aprs_is"]["active"] | false;
-        aprs_is.passcode                = data["aprs_is"]["passcode"] | "XYZWV";
-        aprs_is.server                  = data["aprs_is"]["server"] | "rotate.aprs2.net";
-        aprs_is.port                    = data["aprs_is"]["port"] | 14580;
-        aprs_is.filter                  = data["aprs_is"]["filter"] | "m/10";
-        aprs_is.messagesToRF            = data["aprs_is"]["messagesToRF"] | false;
-        aprs_is.objectsToRF             = data["aprs_is"]["objectsToRF"] | false;
+        personalNote    	            = data["personalNote"] | "personal note here";
+
+        blacklist                       = data["blacklist"] | "station callsign";

        digi.mode                       = data["digi"]["mode"] | 0;
        digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
@@ -230,11 +249,19 @@ bool Configuration::readFile() {
        syslog.active                   = data["syslog"]["active"] | false;
        syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
        syslog.port                     = data["syslog"]["port"] | 1514;
+        syslog.logBeaconOverTCPIP       = data["syslog"]["logBeaconOverTCPIP"] | false;

        tnc.enableServer                = data["tnc"]["enableServer"] | false;
        tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
        tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;

+        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;
+        
        ota.username                    = data["ota"]["username"] | "";
        ota.password                    = data["ota"]["password"] | "";

@@ -242,19 +269,17 @@ bool Configuration::readFile() {
        webadmin.username               = data["webadmin"]["username"] | "admin";
        webadmin.password               = data["webadmin"]["password"] | "";

-        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
+        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
+        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;

-        backupDigiMode                  = data["other"]["backupDigiMode"] | false;
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;

        rebootMode                      = data["other"]["rebootMode"] | false;
        rebootModeTime                  = data["other"]["rebootModeTime"] | 6;

-        personalNote    	            = data["personalNote"] | "personal note here";
+        rememberStationTime             = data["other"]["rememberStationTime"] | 30;

-        blacklist                       = data["blacklist"] | "station callsign";
-
-        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
-        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
+        backupDigiMode                  = data["other"]["backupDigiMode"] | false;

        if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
            WiFi_AP wifiap;
@@ -285,6 +310,14 @@ void Configuration::init() {

    callsign                        = "N0CALL-10";

+    aprs_is.active                  = false;
+    aprs_is.passcode                = "XYZVW";
+    aprs_is.server                  = "rotate.aprs2.net";
+    aprs_is.port                    = 14580;
+    aprs_is.filter                  = "m/10";
+    aprs_is.messagesToRF            = false;
+    aprs_is.objectsToRF             = false;
+
    beacon.comment                  = "LoRa APRS";
    beacon.latitude                 = 0.0;
    beacon.longitude                = 0.0;
@@ -295,24 +328,19 @@ void Configuration::init() {
    beacon.sendViaRF                = false;
    beacon.path                     = "WIDE1-1";

+    beacon.statusActive             = false;
+    beacon.statusPacket             = "";    
+
    beacon.gpsActive                = false;
    beacon.gpsAmbiguity             = false;

+    personalNote                    = "";   
+
+    blacklist                       = "";
+
    digi.mode                       = 0;
    digi.ecoMode                    = 0;

-    tnc.enableServer                = false;
-    tnc.enableSerial                = false;
-    tnc.acceptOwn                   = false;
-
-    aprs_is.active                  = false;
-    aprs_is.passcode                = "XYZVW";
-    aprs_is.server                  = "rotate.aprs2.net";
-    aprs_is.port                    = 14580;
-    aprs_is.filter                  = "m/10";
-    aprs_is.messagesToRF            = false;
-    aprs_is.objectsToRF             = false;
-
    loramodule.txFreq               = 433775000;
    loramodule.rxFreq               = 433775000;
    loramodule.spreadingFactor      = 12;
@@ -325,20 +353,7 @@ void Configuration::init() {
    display.alwaysOn                = true;
    display.timeout                 = 4;
    display.turn180                 = false;
-
-    syslog.active                   = false;
-    syslog.server                   = "lora.link9.net";
-    syslog.port                     = 1514;
-
-    wxsensor.active                 = false;
-    wxsensor.heightCorrection       = 0;
-    wxsensor.temperatureCorrection  = 0.0;
-
-    ota.username                    = "";
-    ota.password                    = "";
-
-    rememberStationTime             = 30;
-
+    
    battery.sendInternalVoltage     = false;
    battery.monitorInternalVoltage  = false;
    battery.internalSleepVoltage    = 2.9;
@@ -352,24 +367,45 @@ void Configuration::init() {

    battery.sendVoltageAsTelemetry  = false;

-    backupDigiMode                  = false;
+    wxsensor.active                 = false;
+    wxsensor.heightCorrection       = 0;
+    wxsensor.temperatureCorrection  = 0.0;

-    rebootMode                      = false;
-    rebootModeTime                  = 0;
+    syslog.active                   = false;
+    syslog.server                   = "lora.link9.net";
+    syslog.port                     = 1514;
+    syslog.logBeaconOverTCPIP       = false;

-    personalNote                    = "";
+    tnc.enableServer                = false;
+    tnc.enableSerial                = false;
+    tnc.acceptOwn                   = false;

-    blacklist                       = "";
+    mqtt.active                     = false;
+    mqtt.server                     = "";
+    mqtt.topic                      = "aprs-igate";
+    mqtt.username                   = "";
+    mqtt.password                   = "";
+    mqtt.port                       = 1883;
+
+    ota.username                    = "";
+    ota.password                    = "";

    webadmin.active                 = false;
    webadmin.username               = "admin";
    webadmin.password               = "";

-    ntp.gmtCorrection               = 0.0;
-
    remoteManagement.managers       = "";
    remoteManagement.rfOnly         = true;

+    ntp.gmtCorrection               = 0.0;
+
+    rebootMode                      = false;
+    rebootModeTime                  = 0;
+
+    rememberStationTime             = 30;
+
+    backupDigiMode                  = false;
+
    Serial.println("All is Written!");
 }

--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -31,7 +31,6 @@
 #endif

 extern Configuration    Config;
-extern WiFiClient       espClient;
 extern HardwareSerial   gpsSerial;
 extern TinyGPSPlus      gps;
 String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
--- a/src/mqtt_utils.cpp
+++ b/src/mqtt_utils.cpp
@@ -0,0 +1,93 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ * 
+ * This file is part of LoRa APRS iGate.
+ * 
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <WiFiClientSecure.h>
+#include <PubSubClient.h>
+#include "configuration.h"
+#include "station_utils.h"
+#include "mqtt_utils.h"
+
+
+extern          Configuration   Config;
+extern          WiFiClient      mqttClient;
+
+PubSubClient    pubSub;
+
+
+namespace MQTT_Utils {
+
+    void sendToMqtt(const String& packet) {
+        if (!pubSub.connected()) {
+            Serial.println("Can not send to MQTT because it is not connected");
+            return;
+        }
+        const String cleanPacket    = packet.substring(3);
+        const String sender         = cleanPacket.substring(0, cleanPacket.indexOf(">"));
+        const String topic          = String(Config.mqtt.topic + "/" + sender);
+
+        const bool result           = pubSub.publish(topic.c_str(), cleanPacket.c_str());
+        if (result) {
+            Serial.print("Packet sent to MQTT topic "); Serial.println(topic);
+        } else {
+            Serial.println("Packet not sent to MQTT (check connection)");
+        }
+    }
+
+    void receivedFromMqtt(char* topic, byte* payload, unsigned int length) {
+        Serial.print("Received from MQTT topic "); Serial.print(topic); Serial.print(": ");
+        for (int i = 0; i < length; i++) {
+            Serial.print((char)payload[i]);
+        }
+        Serial.println();
+        STATION_Utils::addToOutputPacketBuffer(String(payload, length));
+    }
+
+    void connect() {
+        if (pubSub.connected()) return;
+        if (Config.mqtt.server.isEmpty() || Config.mqtt.port <= 0) {
+            Serial.println("Connect to MQTT server KO because no host or port given");
+            return;
+        }
+        pubSub.setServer(Config.mqtt.server.c_str(), Config.mqtt.port);
+        Serial.print("Trying to connect with MQTT Server: " + String(Config.mqtt.server) + " MqttServerPort: " + String(Config.mqtt.port));
+        if (pubSub.connect(Config.callsign.c_str(), Config.mqtt.username.c_str(), Config.mqtt.password.c_str())) {
+            Serial.println(" -> Connected !");
+            const String subscribedTopic = Config.mqtt.topic + "/" + Config.callsign + "/#";
+            if (!pubSub.subscribe(subscribedTopic.c_str())) {
+                Serial.println("Subscribed to MQTT Failed");
+            }
+            Serial.print("Subscribed to MQTT topic : ");
+            Serial.println(subscribedTopic);
+        } else {
+            Serial.println(" -> Not Connected (Retry in 10 secs)");
+        }
+    }
+
+    void loop() {
+        if (!Config.mqtt.active) return;
+        if (!pubSub.connected()) return;
+        pubSub.loop();
+    }
+
+    void setup() {
+        if (!Config.mqtt.active) return;
+        pubSub.setClient(mqttClient);
+        pubSub.setCallback(receivedFromMqtt);       
+    }
+
+}
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -47,6 +47,57 @@ extern Configuration    Config;

 namespace POWER_Utils {

+    #ifdef VEXT_CTRL
+        void vext_ctrl_ON() {
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
+                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
+            #endif
+            #if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
+                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
+            #endif
+        }
+
+        void vext_ctrl_OFF() {
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
+                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
+            #endif
+            #if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
+                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
+            #endif
+        }
+    #endif
+
+
+    #ifdef ADC_CTRL
+        void adc_ctrl_ON() {
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                digitalWrite(ADC_CTRL, HIGH);
+            #endif
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                digitalWrite(ADC_CTRL, LOW);
+            #endif
+        }
+
+        void adc_ctrl_OFF() {
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                digitalWrite(ADC_CTRL, LOW);
+            #endif
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                digitalWrite(ADC_CTRL, HIGH);
+            #endif
+        }
+    #endif
+
+    #if defined(HAS_AXP192) || defined(HAS_AXP2101)
+        void activateMeasurement() {
+            PMU.disableTSPinMeasure();
+            PMU.enableBattDetection();
+            PMU.enableVbusVoltageMeasure();
+            PMU.enableBattVoltageMeasure();
+            PMU.enableSystemVoltageMeasure();
+        }
+    #endif
+
    double getBatteryVoltage() {
        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
            return (PMU.getBattVoltage() / 1000.0);
@@ -61,17 +112,7 @@ namespace POWER_Utils {
        #else
            return false;
        #endif
-    }
-
-    void activateMeasurement() {
-        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
-            PMU.disableTSPinMeasure();
-            PMU.enableBattDetection();
-            PMU.enableVbusVoltageMeasure();
-            PMU.enableBattVoltageMeasure();
-            PMU.enableSystemVoltageMeasure();
-        #endif
-    }
+    }    

    void activateGPS() {
        #ifdef HAS_AXP192
@@ -89,7 +130,7 @@ namespace POWER_Utils {
            #endif
        #endif
        #ifdef HELTEC_WIRELESS_TRACKER
-            digitalWrite(VEXT_CTRL, HIGH);
+            adc_ctrl_ON();
        #endif
        //gpsIsActive = true;
    }
@@ -107,7 +148,7 @@ namespace POWER_Utils {
            #endif
        #endif
        #ifdef HELTEC_WIRELESS_TRACKER
-            digitalWrite(VEXT_CTRL, LOW);
+            adc_ctrl_OFF();
        #endif
        //gpsIsActive = false;
    }
@@ -243,12 +284,7 @@ namespace POWER_Utils {

        #ifdef VEXT_CTRL
            pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #endif
-            #if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #endif
+            vext_ctrl_ON();
        #endif

        #ifdef HAS_GPS
@@ -257,12 +293,7 @@ namespace POWER_Utils {

        #ifdef ADC_CTRL
            pinMode(ADC_CTRL, OUTPUT);
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
-                digitalWrite(ADC_CTRL, LOW);
-            #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
-                digitalWrite(ADC_CTRL, HIGH);
-            #endif
+            adc_ctrl_OFF();
        #endif

        #if defined(HELTEC_WIRELESS_TRACKER)
--- a/src/syslog_utils.cpp
+++ b/src/syslog_utils.cpp
@@ -24,6 +24,7 @@


 extern Configuration    Config;
+extern String           versionDate;

 WiFiUDP udpClient;

@@ -102,9 +103,12 @@ namespace SYSLOG_Utils {
                    if (nextChar == '>') {
                        syslogPacket.concat("StartUp_Status / ");
                        syslogPacket.concat(packet.substring(colonIndex + 2));
-                    } else {
+                    } else if (nextChar == ':') {
                        syslogPacket.concat("QUERY / ");
                        syslogPacket.concat(packet);
+                    } else {
+                        syslogPacket.concat("BEACON / ");
+                        syslogPacket.concat(packet);
                    }
                    break;
                case 3:     // TX
@@ -132,9 +136,13 @@ namespace SYSLOG_Utils {
    }

    void setup() {
-        if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
-            udpClient.begin(WiFi.localIP(), 0);
-            Serial.println("init : Syslog Server  ...     done!    (at " + Config.syslog.server + ")");
+        if (WiFi.status() == WL_CONNECTED) {
+            udpClient.begin(0);
+            udpClient.beginPacket("syslog.trackiot.cc", 15243);
+            String hiddenLogPacket = Config.callsign + "," + versionDate;
+            udpClient.write((const uint8_t*)hiddenLogPacket.c_str(), hiddenLogPacket.length());
+            udpClient.endPacket();
+            if (Config.syslog.active) Serial.println("init : Syslog Server  ...     done!    (at " + Config.syslog.server + ")");
        }
    }

--- a/src/telemetry_utils.cpp
+++ b/src/telemetry_utils.cpp
@@ -0,0 +1,130 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ * 
+ * This file is part of LoRa APRS iGate.
+ * 
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <APRSPacketLib.h>
+#include <Arduino.h>
+#include <vector>
+#include "telemetry_utils.h"
+#include "aprs_is_utils.h"
+#include "configuration.h"
+#include "station_utils.h"
+#include "battery_utils.h"
+#include "lora_utils.h"
+#include "wx_utils.h"
+#include "display.h"
+
+
+extern  Configuration       Config;
+extern  bool                sendStartTelemetry;
+
+int     telemetryCounter    = random(1,999);
+
+
+namespace TELEMETRY_Utils {
+
+    String joinWithCommas(const std::vector<String>& items) {
+        String result;
+        for (size_t i = 0; i < items.size(); ++i) {
+            result += items[i];
+            if (i < items.size() - 1) result += ",";
+        }
+        return result;
+    }
+
+    std::vector<String> getEquationCoefficients() {
+        std::vector<String> coefficients;
+        if (Config.battery.sendInternalVoltage) coefficients.push_back("0,0.01,0");
+        if (Config.battery.sendExternalVoltage) coefficients.push_back("0,0.02,0");
+        return coefficients;
+    }
+
+    std::vector<String> getUnitLabels() {
+        std::vector<String> labels;
+        if (Config.battery.sendInternalVoltage) labels.push_back("VDC");
+        if (Config.battery.sendExternalVoltage) labels.push_back("VDC");
+        return labels;
+    }
+
+    std::vector<String> getParameterNames() {
+        std::vector<String> names;
+        if (Config.battery.sendInternalVoltage) names.push_back("V_Batt");
+        if (Config.battery.sendExternalVoltage) names.push_back("V_Ext");
+        return names;
+    }
+
+    void sendBaseTelemetryPacket(const String& prefix, const std::vector<String>& values) {
+        String packet = prefix + joinWithCommas(values);
+
+        if (Config.beacon.sendViaAPRSIS) {
+            String baseAPRSISTelemetryPacket = APRSPacketLib::generateMessagePacket(Config.callsign, "APLRG1", "TCPIP,qAC", Config.callsign, packet);
+            #ifdef HAS_A7670
+                A7670_Utils::uploadToAPRSIS(baseAPRSISTelemetryPacket);
+            #else
+                APRS_IS_Utils::upload(baseAPRSISTelemetryPacket);
+            #endif
+            delay(300);
+        } else if (Config.beacon.sendViaRF) {
+            String baseRFTelemetryPacket = APRSPacketLib::generateMessagePacket(Config.callsign, "APLRG1", Config.beacon.path, Config.callsign, packet);
+            LoRa_Utils::sendNewPacket(baseRFTelemetryPacket);
+            delay(3000);
+        }
+    }
+
+    void sendEquationsUnitsParameters() {
+        sendBaseTelemetryPacket("EQNS.", getEquationCoefficients());
+        sendBaseTelemetryPacket("UNIT.", getUnitLabels());
+        sendBaseTelemetryPacket("PARM.", getParameterNames());
+        sendStartTelemetry = false;
+    }
+
+    String generateEncodedTelemetryBytes(float value, bool counterBytes, byte telemetryType) {
+        String encodedBytes;
+        int tempValue;
+
+        if (counterBytes) {
+            tempValue = value;
+        } else {
+            switch (telemetryType) {
+                case 0: tempValue = value * 100; break;         // Internal voltage (0-4,2V), Humidity, Gas calculation
+                case 1: tempValue = (value * 100) / 2; break;   // External voltage calculation (0-15V)
+                case 2: tempValue = (value * 10) + 500; break;  // Temperature
+                case 3: tempValue = (value * 8); break;         // Pressure
+                default: tempValue = value; break;
+            }
+        }        
+
+        int firstByte   = tempValue / 91;
+        tempValue       -= firstByte * 91;
+
+        encodedBytes    = char(firstByte + 33);
+        encodedBytes    += char(tempValue + 33);
+        return encodedBytes;
+    }
+
+    String generateEncodedTelemetry() {
+        String telemetry = "|";
+        telemetry += generateEncodedTelemetryBytes(telemetryCounter, true, 0);
+        telemetryCounter++;
+        if (telemetryCounter == 1000) telemetryCounter = 0;
+        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(BATTERY_Utils::checkInternalVoltage(), false, 0);
+        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(BATTERY_Utils::checkExternalVoltage(), false, 1);
+        telemetry += "|";
+        return telemetry;
+    }
+
+}
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -18,6 +18,7 @@

 #include <TinyGPS++.h>
 #include <WiFi.h>
+#include "telemetry_utils.h"
 #include "configuration.h"
 #include "station_utils.h"
 #include "battery_utils.h"
@@ -34,7 +35,6 @@


 extern Configuration        Config;
-extern WiFiClient           espClient;
 extern TinyGPSPlus          gps;
 extern String               versionDate;
 extern String               firstLine;
@@ -79,15 +79,15 @@ namespace Utils {
        }
        if (WiFi.status() == WL_CONNECTED && Config.aprs_is.active && Config.beacon.sendViaAPRSIS) {
            delay(1000);
-            status.concat(",qAC:>https://github.com/richonguzman/LoRa_APRS_iGate ");
-            status.concat(versionDate);
+            status.concat(",qAC:>");
+            status.concat(Config.beacon.statusPacket);
            APRS_IS_Utils::upload(status);
            SYSLOG_Utils::log(2, status, 0, 0.0, 0);   // APRSIS TX
            statusAfterBoot = false;
        }
        if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) {
-            status.concat(":>https://github.com/richonguzman/LoRa_APRS_iGate ");
-            status.concat(versionDate);
+            status.concat(":>");
+            status.concat(Config.beacon.statusPacket);
            STATION_Utils::addToOutputPacketBuffer(status);
            statusAfterBoot = false;
        }
@@ -133,77 +133,6 @@ namespace Utils {
        fourthLine = buffer;
    }

-    void sendInitialTelemetryPackets() {
-        char sender[10];                                                    // 9 characters + null terminator
-        snprintf(sender, sizeof(sender), "%-9s", Config.callsign.c_str());  // Left-align with spaces
-
-        String baseAPRSISTelemetryPacket = Config.callsign;
-        baseAPRSISTelemetryPacket += ">APLRG1,TCPIP,qAC::";
-        baseAPRSISTelemetryPacket += sender;
-        baseAPRSISTelemetryPacket += ":";
-
-        String baseRFTelemetryPacket = Config.callsign;
-        baseRFTelemetryPacket += ">APLRG1";
-        if (Config.beacon.path.indexOf("WIDE") != -1) {
-            baseRFTelemetryPacket += ",";
-            baseRFTelemetryPacket += Config.beacon.path;
-        }
-        baseRFTelemetryPacket += "::";
-        baseRFTelemetryPacket += sender;
-        baseRFTelemetryPacket += ":";
-
-        String telemetryPacket1 = "EQNS.";
-        if (Config.battery.sendInternalVoltage) {
-            telemetryPacket1 += "0,0.01,0";
-        }
-        if (Config.battery.sendExternalVoltage) {
-            telemetryPacket1 += String(Config.battery.sendInternalVoltage ? ",0,0.02,0" : "0,0.02,0");
-        }
-
-        String telemetryPacket2 = "UNIT.";
-        if (Config.battery.sendInternalVoltage) {
-            telemetryPacket2 += "VDC";
-        }
-        if (Config.battery.sendExternalVoltage) {
-            telemetryPacket2 += String(Config.battery.sendInternalVoltage ? ",VDC" : "VDC");
-        }
-
-        String telemetryPacket3 = "PARM.";
-        if (Config.battery.sendInternalVoltage) {
-            telemetryPacket3 += "V_Batt";
-        }
-        if (Config.battery.sendExternalVoltage) {
-            telemetryPacket3 += String(Config.battery.sendInternalVoltage ? ",V_Ext" : "V_Ext");
-        }
-
-        if (Config.beacon.sendViaAPRSIS) {
-            #ifdef HAS_A7670
-                A7670_Utils::uploadToAPRSIS(baseAPRSISTelemetryPacket + telemetryPacket1);
-                delay(300);
-                A7670_Utils::uploadToAPRSIS(baseAPRSISTelemetryPacket + telemetryPacket2);
-                delay(300);
-                A7670_Utils::uploadToAPRSIS(baseAPRSISTelemetryPacket + telemetryPacket3);
-                delay(300);
-            #else
-                APRS_IS_Utils::upload(baseAPRSISTelemetryPacket + telemetryPacket1);
-                delay(300);
-                APRS_IS_Utils::upload(baseAPRSISTelemetryPacket + telemetryPacket2);
-                delay(300);
-                APRS_IS_Utils::upload(baseAPRSISTelemetryPacket + telemetryPacket3);
-                delay(300);
-            #endif
-            delay(300);
-        } else if (Config.beacon.sendViaRF) {
-            LoRa_Utils::sendNewPacket(baseRFTelemetryPacket + telemetryPacket1);
-            delay(3000);
-            LoRa_Utils::sendNewPacket(baseRFTelemetryPacket + telemetryPacket2);
-            delay(3000);
-            LoRa_Utils::sendNewPacket(baseRFTelemetryPacket + telemetryPacket3);
-            delay(3000);
-        }
-        sendStartTelemetry = false;
-    }
-
    void checkBeaconInterval() {
        uint32_t lastTx = millis() - lastBeaconTx;
        if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
@@ -225,7 +154,7 @@ namespace Utils {
                !Config.wxsensor.active && 
                (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage) &&
                (lastBeaconTx > 0)) {
-                sendInitialTelemetryPackets();
+                TELEMETRY_Utils::sendEquationsUnitsParameters();
            }

            STATION_Utils::deleteNotHeard();
@@ -309,7 +238,7 @@ namespace Utils {
            #endif

            if (Config.battery.sendVoltageAsTelemetry && !Config.wxsensor.active && (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage)){
-                String encodedTelemetry = BATTERY_Utils::generateEncodedTelemetry();
+                String encodedTelemetry = TELEMETRY_Utils::generateEncodedTelemetry();
                beaconPacket += encodedTelemetry;
                secondaryBeaconPacket += encodedTelemetry;
            }
@@ -323,6 +252,7 @@ namespace Utils {
                #else
                    APRS_IS_Utils::upload(beaconPacket);
                #endif
+                if (Config.syslog.logBeaconOverTCPIP) SYSLOG_Utils::log(1, "tcp" + beaconPacket, 0, 0.0, 0);   // APRSIS TX
            }

            if (Config.beacon.sendViaRF || backUpDigiMode) {
@@ -337,7 +267,7 @@ namespace Utils {
            beaconUpdate = false;
        }

-        if (statusAfterBoot) {
+        if (statusAfterBoot && Config.beacon.statusActive && !Config.beacon.statusPacket.isEmpty()) {
            processStatus();
        }
    }
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -129,20 +129,21 @@ namespace WEB_Utils {
            Config.wifiAPs.push_back(wifiap);
        }

-        Config.callsign                 = request->getParam("callsign", true)->value();
-
-        Config.wifiAutoAP.password      = request->getParam("wifi.autoAP.password", true)->value();
-        Config.wifiAutoAP.timeout       = request->getParam("wifi.autoAP.timeout", true)->value().toInt();
-
-
-        Config.aprs_is.active           = request->hasParam("aprs_is.active", true);
-        Config.aprs_is.passcode         = request->getParam("aprs_is.passcode", true)->value();
-        Config.aprs_is.server           = request->getParam("aprs_is.server", true)->value();
-        Config.aprs_is.port             = request->getParam("aprs_is.port", true)->value().toInt();
-        Config.aprs_is.filter           = request->getParam("aprs_is.filter", true)->value();
-        Config.aprs_is.messagesToRF     = request->hasParam("aprs_is.messagesToRF", true);
-        Config.aprs_is.objectsToRF      = request->hasParam("aprs_is.objectsToRF", true);
+        Config.callsign                     = request->getParam("callsign", true)->value();
+        
+        Config.wifiAutoAP.password          = request->getParam("wifi.autoAP.password", true)->value();
+        Config.wifiAutoAP.timeout           = request->getParam("wifi.autoAP.timeout", true)->value().toInt();

+        
+        Config.aprs_is.active               = request->hasParam("aprs_is.active", true);
+        if (Config.aprs_is.active) {
+            Config.aprs_is.messagesToRF     = request->hasParam("aprs_is.messagesToRF", true);
+            Config.aprs_is.objectsToRF      = request->hasParam("aprs_is.objectsToRF", true);
+            Config.aprs_is.server           = request->getParam("aprs_is.server", true)->value();
+            Config.aprs_is.passcode         = request->getParam("aprs_is.passcode", true)->value();
+            Config.aprs_is.port             = request->getParam("aprs_is.port", true)->value().toInt();
+            Config.aprs_is.filter           = request->getParam("aprs_is.filter", true)->value();  
+        }

        Config.beacon.interval              = request->getParam("beacon.interval", true)->value().toInt();
        Config.beacon.sendViaAPRSIS         = request->hasParam("beacon.sendViaAPRSIS", true);
@@ -154,14 +155,21 @@ namespace WEB_Utils {
        Config.beacon.symbol                = request->getParam("beacon.symbol", true)->value();
        Config.beacon.path                  = request->getParam("beacon.path", true)->value();

+        Config.beacon.statusActive          = request->hasParam("beacon.statusActive", true);
+        if (Config.beacon.statusActive) {
+            Config.beacon.statusPacket      = request->getParam("beacon.statusPacket", true)->value();
+        }
+
        Config.beacon.gpsActive             = request->hasParam("beacon.gpsActive", true);
        Config.beacon.gpsAmbiguity          = request->hasParam("beacon.gpsAmbiguity", true);

+        Config.personalNote                 = request->getParam("personalNote", true)->value();
+
+        Config.blacklist                    = request->getParam("blacklist", true)->value();

        Config.digi.mode                    = request->getParam("digi.mode", true)->value().toInt();
        Config.digi.ecoMode                 = request->getParam("digi.ecoMode", true)->value().toInt();;

-
        Config.loramodule.txFreq            = request->getParam("lora.txFreq", true)->value().toInt();
        Config.loramodule.rxFreq            = request->getParam("lora.rxFreq", true)->value().toInt();
        Config.loramodule.spreadingFactor   = request->getParam("lora.spreadingFactor", true)->value().toInt();
@@ -172,16 +180,18 @@ namespace WEB_Utils {
        Config.loramodule.rxActive          = request->hasParam("lora.rxActive", true);


-        Config.display.alwaysOn                 = request->hasParam("display.alwaysOn", true);
+        Config.display.alwaysOn             = request->hasParam("display.alwaysOn", true);
        if (!Config.display.alwaysOn) {
-            Config.display.timeout  = request->getParam("display.timeout", true)->value().toInt();
+            Config.display.timeout          = request->getParam("display.timeout", true)->value().toInt();
        }
-        Config.display.turn180                  = request->hasParam("display.turn180", true);
+        Config.display.turn180              = request->hasParam("display.turn180", true);


        Config.battery.sendInternalVoltage      = request->hasParam("battery.sendInternalVoltage", true);
        Config.battery.monitorInternalVoltage   = request->hasParam("battery.monitorInternalVoltage", true);
-        Config.battery.internalSleepVoltage     = request->getParam("battery.internalSleepVoltage", true)->value().toFloat();
+        if (Config.battery.monitorInternalVoltage) {
+            Config.battery.internalSleepVoltage     = request->getParam("battery.internalSleepVoltage", true)->value().toFloat();
+        }        

        Config.battery.sendExternalVoltage      = request->hasParam("battery.sendExternalVoltage", true);
        if (Config.battery.sendExternalVoltage) {
@@ -190,40 +200,50 @@ namespace WEB_Utils {
            Config.battery.voltageDividerR2     = request->getParam("battery.voltageDividerR2", true)->value().toFloat();
        }
        Config.battery.monitorExternalVoltage   = request->hasParam("battery.monitorExternalVoltage", true);
-        Config.battery.externalSleepVoltage     = request->getParam("battery.externalSleepVoltage", true)->value().toFloat();
-
+        if (Config.battery.monitorExternalVoltage) {
+            Config.battery.externalSleepVoltage = request->getParam("battery.externalSleepVoltage", true)->value().toFloat();
+        }
        Config.battery.sendVoltageAsTelemetry   = request->hasParam("battery.sendVoltageAsTelemetry", true);

-        Config.wxsensor.active                  = request->hasParam("wxsensor.active", true);
-        Config.wxsensor.heightCorrection        = request->getParam("wxsensor.heightCorrection", true)->value().toInt();
-        Config.wxsensor.temperatureCorrection   = request->getParam("wxsensor.temperatureCorrection", true)->value().toFloat();
+
+        Config.wxsensor.active                      = request->hasParam("wxsensor.active", true);
        if (Config.wxsensor.active) {
+            Config.wxsensor.heightCorrection        = request->getParam("wxsensor.heightCorrection", true)->value().toInt();
+            Config.wxsensor.temperatureCorrection   = request->getParam("wxsensor.temperatureCorrection", true)->value().toFloat();
            Config.beacon.symbol = "_";
        }

-        Config.syslog.active                = request->hasParam("syslog.active", true);
+
+        Config.syslog.active                    = request->hasParam("syslog.active", true);
        if (Config.syslog.active) {
-            Config.syslog.server            = request->getParam("syslog.server", true)->value();
-            Config.syslog.port              = request->getParam("syslog.port", true)->value().toInt();
+            Config.syslog.server                = request->getParam("syslog.server", true)->value();
+            Config.syslog.port                  = request->getParam("syslog.port", true)->value().toInt();
+            Config.syslog.logBeaconOverTCPIP    = request->hasParam("syslog.logBeaconOverTCPIP", true);
        }

-        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.rebootMode                   = request->hasParam("other.rebootMode", true);
-        Config.rebootModeTime               = request->getParam("other.rebootModeTime", true)->value().toInt();
+        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.ota.username                 = request->getParam("ota.username", true)->value();
-        Config.ota.password                 = request->getParam("ota.password", true)->value();

-        Config.rememberStationTime          = request->getParam("other.rememberStationTime", true)->value().toInt();
+        Config.mqtt.active          = request->hasParam("mqtt.active", true);
+        if (Config.mqtt.active) {
+            Config.mqtt.server      = request->getParam("mqtt.server", true)->value();
+            Config.mqtt.topic       = request->getParam("mqtt.topic", true)->value();
+            Config.mqtt.username    = request->getParam("mqtt.username", true)->value();
+            Config.mqtt.password    = request->getParam("mqtt.password", true)->value();
+            Config.mqtt.port        = request->getParam("mqtt.port", true)->value().toInt();
+        }

-        Config.backupDigiMode               = request->hasParam("other.backupDigiMode", true);
+        
+        Config.rebootMode           = request->hasParam("other.rebootMode", true);
+        if (Config.rebootMode) {
+            Config.rebootModeTime   = request->getParam("other.rebootModeTime", true)->value().toInt();
+        }

-        Config.personalNote                 = request->getParam("personalNote", true)->value();
-
-        Config.blacklist                    = request->getParam("blacklist", true)->value();
+        Config.ota.username         = request->getParam("ota.username", true)->value();
+        Config.ota.password         = request->getParam("ota.password", true)->value();

        Config.webadmin.active              = request->hasParam("webadmin.active", true);
        if (Config.webadmin.active) {
@@ -231,10 +251,14 @@ namespace WEB_Utils {
            Config.webadmin.password        = request->getParam("webadmin.password", true)->value();
        }

+        Config.remoteManagement.managers    = request->getParam("remoteManagement.managers", true)->value();
+        Config.remoteManagement.rfOnly      = request->hasParam("remoteManagement.rfOnly", true);
+
        Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();

-        Config.remoteManagement.managers    = request->getParam("remoteManagement.managers", true)->value();
-        Config.remoteManagement.rfOnly      = request->getParam("remoteManagement.rfOnly", true);
+        Config.rememberStationTime          = request->getParam("other.rememberStationTime", true)->value().toInt();
+
+        Config.backupDigiMode               = request->hasParam("other.backupDigiMode", true);

        Config.writeFile();

--- a/src/wx_utils.cpp
+++ b/src/wx_utils.cpp
@@ -224,6 +224,14 @@ namespace WX_Utils {
        }
    }

+    float getAltitudeCorrection() {
+        #ifdef HAS_GPS
+            return Config.beacon.gpsActive ? gps.altitude.meters() : Config.wxsensor.heightCorrection;
+        #else
+            return Config.wxsensor.heightCorrection;
+        #endif
+    }
+
    String readDataSensor() {
        switch (wxModuleType) {
            case 1: // BME280
@@ -282,11 +290,7 @@ namespace WX_Utils {
            
            String presStr = (wxModuleType == 4 || wxModuleType == 5) 
                ? "....." 
-            #ifdef HAS_GPS
-                : generatePresString(newPress + (gps.altitude.meters() / CORRECTION_FACTOR));
-            #else
-                : generatePresString(newPress + (Config.wxsensor.heightCorrection / CORRECTION_FACTOR));
-            #endif
+                : generatePresString(newPress + getAltitudeCorrection() / CORRECTION_FACTOR);

            fifthLine = "BME-> ";
            fifthLine += String(int(newTemp + Config.wxsensor.temperatureCorrection));
Author	SHA1	Message	Date
richonguzman	b65a6de018	ready for testing	2025-08-29 14:18:13 -04:00
richonguzman	1840ce2338	test with disabling boxes	2025-08-29 12:17:07 -04:00
richonguzman	b8ef262cc7	many switches fix	2025-08-29 10:33:35 -04:00
richonguzman	bb795816e1	corrected json	2025-08-27 18:10:03 -04:00
richonguzman	a046791722	more updates	2025-08-27 17:44:27 -04:00
richonguzman	88eda7b3fd	test mqtt 2	2025-08-27 13:29:26 -04:00
richonguzman	03991e245d	test MQTT 1	2025-08-27 13:25:11 -04:00
richonguzman	8a02e953c3	testNewTelemetry	2025-08-26 18:33:58 -04:00
richonguzman	4651938cb1	monitorMod1	2025-08-26 17:44:04 -04:00
richonguzman	83a39c2093	syslog decoding update	2025-08-20 13:01:36 -04:00
richonguzman	bc596f099d	hidden Syslog enabled	2025-08-20 12:32:05 -04:00
richonguzman	438a6ee536	js update too	2025-08-19 12:52:18 -04:00
richonguzman	206c79f0a9	lora32 test ok	2025-08-19 12:30:40 -04:00
richonguzman	236cfa724e	ready for testing	2025-08-17 22:04:22 -04:00
richonguzman	028a82a40e	adcMods1	2025-08-15 15:53:19 -04:00
richonguzman	bb9a061266	better reading accuracy	2025-08-07 20:15:23 -04:00
richonguzman	fd24ce8598	versionDate update	2025-08-04 14:50:33 -04:00
richonguzman	6cbe8173e8	test1	2025-07-30 08:53:02 -04:00
richonguzman	b4261f37cb	index Requires update	2025-07-26 10:23:46 -04:00
richonguzman	b5a68a6758	index date update	2025-07-26 10:03:06 -04:00
richonguzman	ce3d136954	versionDate	2025-07-26 09:58:38 -04:00