update complete

Update README.md

.github/workflows/build.yml

@@ -67,7 +67,7 @@ jobs:
                       chip: esp32s3
                     - name: heltec_ht-ct62
                       chip: esp32c3
-                    - name: heltec_wireless_paper
+                    - name: heltec_wireless_paper_v1
                       chip: esp32s3
                     - name: OE5HWN_MeshCom
                       chip: esp32

README.md

@@ -60,6 +60,8 @@ ____________________________________________________
 
 ## Timeline (Versions):
 
+- 2025-09-26 Heltec Wireless Bridge support added.
+- 2025-09-09 MQTT added (pub+sub), Status defined by Op now and many fixes more.
 - 2025-06-20 Digipeaters now with updated EcoMode (Board Sleeps until packet Rx reducing current consumption to almost 10% at idle).
 - 2025-06-20 New Boards Added: Heltec T114 MeshNode, Faketec V3 as Digipeaters and QRP Labs LightGateway Plus 1.0.
 - 2025-06-19 DateVersion format Change. Licence changed into GNU GPLv3.

data/igate_conf.json

@@ -18,17 +18,21 @@
         "sendViaAPRSIS": false,
         "sendViaRF": false,
         "statusActive": false,
-        "statusPacket": ""
+        "statusPacket": "",
+        "gpsActive": false,
+        "gpsAmbiguity": false
     },
     "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
@@ -76,6 +80,14 @@
         "enableSerial": false,
         "acceptOwn": false
     },
+    "mqtt": {
+        "active": false,
+        "server": "",
+        "topic": "",
+        "username": "",
+        "password": "",
+        "port": 1883
+    },
     "ota": {
         "username": "",
         "password": ""
@@ -84,27 +96,17 @@
         "username": "admin",
         "password": ""
     },
-    "ntp": {
-        "gmtCorrection": 0.0
-    },
     "remoteManagement": {
         "managers": "",
         "rfOnly": true
-    }, 
-    "mqtt": {
-        "active": false,
-        "server": "",
-        "topic": "",
-        "username": "",
-        "password": "",
-        "port": 1883
-    },       
+    },
+    "ntp": {
+        "gmtCorrection": 0.0
+    },
     "other": {
         "rememberStationTime": 30,
         "backupDigiMode": false,
         "rebootMode": false,
         "rebootModeTime": 6
-    },
-    "personalNote": "",
-    "blacklist": ""
+    }
 }

data_embed/index.html

@@ -283,6 +283,7 @@
                                             id="beacon.statusPacket"
                                             class="form-control"
                                             placeholder="Custom Status"
+                                            value=""
                                         />
                                     </div>
                                 </div>
@@ -438,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">
@@ -454,6 +456,7 @@
                                             id="aprs_is.port"
                                             placeholder="14580"
                                             class="form-control"
+                                            value="14580"
                                         />
                                     </div>
                                 </div>
@@ -469,6 +472,7 @@
                                             name="aprs_is.passcode"
                                             id="aprs_is.passcode"
                                             class="form-control"
+                                            value="XYZWV"
                                         />
                                     </div>
                                     <div class="col-4">
@@ -482,6 +486,7 @@
                                             class="form-control"
                                             name="aprs_is.filter"
                                             id="aprs_is.filter"
+                                            value="m/10"
                                         />
                                     </div>
                                 </div>
@@ -866,7 +871,10 @@
                                                 name="lora.signalBandwidth"
                                                 id="lora.signalBandwidth"
                                                 required=""
-                                            >
+                                            >   
+                                                <option value="62500" selected>
+                                                    62.5 kHz
+                                                </option>
                                                 <option value="125000" selected>
                                                     125 kHz
                                                 </option>
@@ -1018,6 +1026,8 @@
                                                 name="display.timeout"
                                                 id="display.timeout"
                                                 value="4"
+                                                step="1"
+                                                min="2"
                                                 class="form-control"
                                             />
                                             <span class="input-group-text"
@@ -1379,7 +1389,6 @@
                                             id="syslog.server"
                                             placeholder="lora.link9.net"
                                             class="form-control"
-                                            disabled
                                         />
                                     </div>
                                     <div class="col-6">
@@ -1394,7 +1403,6 @@
                                             id="syslog.port"
                                             placeholder="1514"
                                             class="form-control"
-                                            disabled
                                         />
                                     </div>
                                     <div class="col-6">
@@ -1408,7 +1416,7 @@
                                             <label
                                                 for="syslog.logBeaconOverTCPIP"
                                                 class="form-label"
-                                                >Log Beacon over TPCIP</label
+                                                >Log Beacon over TCP/IP</label
                                             >
                                         </div>
                                     </div>

data_embed/script.js

@@ -49,29 +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"]');
-const logBeaconOverTCPIPField   = document.querySelector('input[name="syslog.logBeaconOverTCPIP"]');
-
-logCheckbox.addEventListener("change", function () {
-    serverField.disabled                = !this.checked;
-    portField.disabled                  = !this.checked;
-    logBeaconOverTCPIPField.disabled    = !this.checked
-});
 
 function loadSettings(settings) {
     currentSettings = settings;
@@ -127,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;
@@ -138,6 +122,8 @@ function loadSettings(settings) {
 
     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;
@@ -147,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;
@@ -163,40 +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;
     document.getElementById("syslog.logBeaconOverTCPIP").checked        = settings.syslog.logBeaconOverTCPIP;
-
-    if (settings.syslog.active) {
-        serverField.disabled                = false;
-        portField.disabled                  = false;
-        logBeaconOverTCPIPField.disabled    = false;
-    }
-
+    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;
@@ -204,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;
@@ -220,28 +232,22 @@ 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;
-
-    // NTP
-    document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
-
-    // 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;
-
-    // Experimental
-    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
+    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;
+
+    // Experimental
+    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
+
     updateImage();
     refreshSpeedStandard();
-    toggleFields();
 }
 
 function showToast(message) {
@@ -268,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;
 
@@ -295,96 +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"]'
-);
-
-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;
+// 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 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"]'
-);
+// 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;
+});
+
+// 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;
+    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;
+});
+
+
 document.querySelector(".new button").addEventListener("click", function () {
     const networksContainer = document.querySelector(".list-networks");
 

include/configuration.h

@@ -185,8 +185,8 @@ public:
     REMOTE_MANAGEMENT       remoteManagement;
     MQTT                    mqtt;
 
-    void init();
-    void writeFile();
+    void setDefaultValues();
+    bool writeFile();
     Configuration();
 
 private:

src/LoRa_APRS_iGate.cpp

@@ -67,7 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-08-27";
+String              versionDate             = "2025-09-26";
+String              versionNumber           = "3.1.2.1";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;

src/aprs_is_utils.cpp

@@ -41,6 +41,7 @@ extern String               sixthLine;
 extern String               seventhLine;
 extern bool                 modemLoggedToAPRSIS;
 extern bool                 backUpDigiMode;
+extern String               versionNumber;
 
 uint32_t    lastRxTime      = millis();
 bool        passcodeValid   = false;
@@ -78,7 +79,9 @@ namespace APRS_IS_Utils {
             aprsAuth += Config.callsign;
             aprsAuth += " pass ";
             aprsAuth += Config.aprs_is.passcode;
-            aprsAuth += " vers CA2RXU_iGate 3.0 filter ";
+            aprsAuth += " vers CA2RXUiGate ";
+            aprsAuth += versionNumber;
+            aprsAuth += " filter ";
             aprsAuth += Config.aprs_is.filter;
             upload(aprsAuth);
         }

src/battery_utils.cpp

@@ -147,7 +147,7 @@ namespace BATTERY_Utils {
             #ifdef ADC_CTRL
                 POWER_Utils::adc_ctrl_OFF();
 
-                #ifdef HELTEC_WP
+                #ifdef HELTEC_WP_V1
                 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.
@@ -216,7 +216,7 @@ namespace BATTERY_Utils {
                 shouldSleepLowVoltage = true;
             }
         #endif
-        #ifndef HELTEC_WP
+        #ifndef HELTEC_WP_V1
             if (Config.battery.monitorExternalVoltage && checkExternalVoltage() < Config.battery.externalSleepVoltage + 0.1) {
                 shouldSleepLowVoltage = true;
             }

src/configuration.cpp

@@ -26,138 +26,146 @@
 bool shouldSleepStop = true;
 
 
-void Configuration::writeFile() {
-    Serial.println("Saving config...");
+bool Configuration::writeFile() {
+    Serial.println("Saving configuration...");
 
-    StaticJsonDocument<2560> data;
+    StaticJsonDocument<3584> data;
     File configFile = SPIFFS.open("/igate_conf.json", "w");
 
-    if (wifiAPs[0].ssid != "") { // We don't want to save Auto AP empty SSID
-        for (int i = 0; i < wifiAPs.size(); i++) {
-            data["wifi"]["AP"][i]["ssid"] = wifiAPs[i].ssid;
-            data["wifi"]["AP"][i]["password"] = wifiAPs[i].password;
-        }
+    if (!configFile) {
+        Serial.println("Error: Could not open config file for writing");
+        return false;
     }
+    try {
 
-    data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
-    data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
+        if (wifiAPs[0].ssid != "") { // We don't want to save Auto AP empty SSID
+            for (int i = 0; i < wifiAPs.size(); i++) {
+                data["wifi"]["AP"][i]["ssid"] = wifiAPs[i].ssid;
+                data["wifi"]["AP"][i]["password"] = wifiAPs[i].password;
+            }
+        }
 
-    data["callsign"]                            = callsign;
+        data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
+        data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
-    data["aprs_is"]["active"]                   = aprs_is.active;
-    data["aprs_is"]["passcode"]                 = aprs_is.passcode;
-    data["aprs_is"]["server"]                   = aprs_is.server;
-    data["aprs_is"]["port"]                     = aprs_is.port;
-    data["aprs_is"]["filter"]                   = aprs_is.filter;
-    data["aprs_is"]["messagesToRF"]             = aprs_is.messagesToRF;
-    data["aprs_is"]["objectsToRF"]              = aprs_is.objectsToRF;
+        data["callsign"]                            = callsign;
 
-    data["beacon"]["comment"]                   = beacon.comment;
-    data["beacon"]["interval"]                  = beacon.interval;
-    data["beacon"]["latitude"]                  = beacon.latitude;
-    data["beacon"]["longitude"]                 = beacon.longitude;
-    data["beacon"]["overlay"]                   = beacon.overlay;
-    data["beacon"]["symbol"]                    = beacon.symbol;
-    data["beacon"]["sendViaAPRSIS"]             = beacon.sendViaAPRSIS;
-    data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
-    data["beacon"]["path"]                      = beacon.path;
+        data["aprs_is"]["active"]                   = aprs_is.active;
+        data["aprs_is"]["passcode"]                 = aprs_is.passcode;
+        data["aprs_is"]["server"]                   = aprs_is.server;
+        data["aprs_is"]["port"]                     = aprs_is.port;
+        data["aprs_is"]["filter"]                   = aprs_is.filter;
+        data["aprs_is"]["messagesToRF"]             = aprs_is.messagesToRF;
+        data["aprs_is"]["objectsToRF"]              = aprs_is.objectsToRF;
 
-    data["beacon"]["statusActive"]              = beacon.statusActive;
-    data["beacon"]["statusPacket"]              = beacon.statusPacket;
+        data["beacon"]["comment"]                   = beacon.comment;
+        data["beacon"]["interval"]                  = beacon.interval;
+        data["beacon"]["latitude"]                  = beacon.latitude;
+        data["beacon"]["longitude"]                 = beacon.longitude;
+        data["beacon"]["overlay"]                   = beacon.overlay;
+        data["beacon"]["symbol"]                    = beacon.symbol;
+        data["beacon"]["sendViaAPRSIS"]             = beacon.sendViaAPRSIS;
+        data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
+        data["beacon"]["path"]                      = beacon.path;
 
-    data["beacon"]["gpsActive"]                 = beacon.gpsActive;
-    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
+        data["beacon"]["statusActive"]              = beacon.statusActive;
+        data["beacon"]["statusPacket"]              = beacon.statusPacket;
 
-    data["digi"]["mode"]                        = digi.mode;
-    data["digi"]["ecoMode"]                     = digi.ecoMode;
-    #if defined(HAS_A7670)
-        if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
-    #endif
+        data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+        data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
 
-    data["lora"]["rxFreq"]                      = loramodule.rxFreq;
-    data["lora"]["txFreq"]                      = loramodule.txFreq;
-    data["lora"]["spreadingFactor"]             = loramodule.spreadingFactor;
-    data["lora"]["signalBandwidth"]             = loramodule.signalBandwidth;
-    data["lora"]["codingRate4"]                 = loramodule.codingRate4;
-    data["lora"]["power"]                       = loramodule.power;
-    data["lora"]["txActive"]                    = loramodule.txActive;
-    data["lora"]["rxActive"]                    = loramodule.rxActive;
+        data["personalNote"]                        = personalNote;
 
-    data["display"]["alwaysOn"]                 = display.alwaysOn;
-    data["display"]["timeout"]                  = display.timeout;
-    data["display"]["turn180"]                  = display.turn180;
+        data["blacklist"]                           = blacklist;
 
-    data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
-    data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
-    data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
+        data["digi"]["mode"]                        = digi.mode;
+        data["digi"]["ecoMode"]                     = digi.ecoMode;
+        #if defined(HAS_A7670)
+            if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
+        #endif
 
-    data["battery"]["sendExternalVoltage"]      = battery.sendExternalVoltage;
-    data["battery"]["externalVoltagePin"]       = battery.externalVoltagePin;
-    data["battery"]["monitorExternalVoltage"]   = battery.monitorExternalVoltage;
-    data["battery"]["externalSleepVoltage"]     = battery.externalSleepVoltage;
-    data["battery"]["voltageDividerR1"]         = battery.voltageDividerR1;
-    data["battery"]["voltageDividerR2"]         = battery.voltageDividerR2;
+        data["lora"]["rxFreq"]                      = loramodule.rxFreq;
+        data["lora"]["txFreq"]                      = loramodule.txFreq;
+        data["lora"]["spreadingFactor"]             = loramodule.spreadingFactor;
+        data["lora"]["signalBandwidth"]             = loramodule.signalBandwidth;
+        data["lora"]["codingRate4"]                 = loramodule.codingRate4;
+        data["lora"]["power"]                       = loramodule.power;
+        data["lora"]["txActive"]                    = loramodule.txActive;
+        data["lora"]["rxActive"]                    = loramodule.rxActive;
 
-    data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
+        data["display"]["alwaysOn"]                 = display.alwaysOn;
+        data["display"]["timeout"]                  = display.timeout;
+        data["display"]["turn180"]                  = display.turn180;
 
-    data["wxsensor"]["active"]                  = wxsensor.active;
-    data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
-    data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
+        data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
+        data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
+        data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
 
-    data["syslog"]["active"]                    = syslog.active;
-    data["syslog"]["server"]                    = syslog.server;
-    data["syslog"]["port"]                      = syslog.port;
-    data["syslog"]["logBeaconOverTCPIP"]        = syslog.logBeaconOverTCPIP;
+        data["battery"]["sendExternalVoltage"]      = battery.sendExternalVoltage;
+        data["battery"]["externalVoltagePin"]       = battery.externalVoltagePin;
+        data["battery"]["monitorExternalVoltage"]   = battery.monitorExternalVoltage;
+        data["battery"]["externalSleepVoltage"]     = battery.externalSleepVoltage;
+        data["battery"]["voltageDividerR1"]         = battery.voltageDividerR1;
+        data["battery"]["voltageDividerR2"]         = battery.voltageDividerR2;
 
-    data["tnc"]["enableServer"]                 = tnc.enableServer;
-    data["tnc"]["enableSerial"]                 = tnc.enableSerial;
-    data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
+        data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
 
-    data["other"]["rebootMode"]                 = rebootMode;
-    data["other"]["rebootModeTime"]             = rebootModeTime;
+        data["wxsensor"]["active"]                  = wxsensor.active;
+        data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
+        data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
 
-    data["ota"]["username"]                     = ota.username;
-    data["ota"]["password"]                     = ota.password;
+        data["syslog"]["active"]                    = syslog.active;
+        data["syslog"]["server"]                    = syslog.server;
+        data["syslog"]["port"]                      = syslog.port;
+        data["syslog"]["logBeaconOverTCPIP"]        = syslog.logBeaconOverTCPIP;
 
-    data["other"]["rememberStationTime"]        = rememberStationTime;
+        data["tnc"]["enableServer"]                 = tnc.enableServer;
+        data["tnc"]["enableSerial"]                 = tnc.enableSerial;
+        data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
 
-    data["other"]["backupDigiMode"]             = backupDigiMode;
+        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["personalNote"]                        = personalNote;
+        data["ota"]["username"]                     = ota.username;
+        data["ota"]["password"]                     = ota.password;
 
-    data["blacklist"]                           = blacklist;
+        data["webadmin"]["active"]                  = webadmin.active;
+        data["webadmin"]["username"]                = webadmin.username;
+        data["webadmin"]["password"]                = webadmin.password;
 
-    data["webadmin"]["active"]                  = webadmin.active;
-    data["webadmin"]["username"]                = webadmin.username;
-    data["webadmin"]["password"]                = webadmin.password;
+        data["remoteManagement"]["managers"]        = remoteManagement.managers;
+        data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
 
-    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+        data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
 
-    data["remoteManagement"]["managers"]        = remoteManagement.managers;
-    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
+        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["other"]["rememberStationTime"]        = rememberStationTime;
 
-    serializeJson(data, configFile);
+        data["other"]["backupDigiMode"]             = backupDigiMode;
 
-    configFile.close();
-
-    Serial.println("Config saved");
-    delay(200);
+        serializeJson(data, configFile);
+        configFile.close();
+        return true;
+    } catch (...) {
+        Serial.println("Error: Exception occurred while saving config");
+        configFile.close();
+        return false;
+    }
 }
 
 bool Configuration::readFile() {
     Serial.println("Reading config..");
-
     File configFile = SPIFFS.open("/igate_conf.json", "r");
 
     if (configFile) {
-        StaticJsonDocument<2560> data;
+        bool needsRewrite = false;
+        StaticJsonDocument<3584> data;
 
         DeserializationError error = deserializeJson(data, configFile);
         if (error) {
@@ -173,12 +181,42 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
 
+        if (!data["wifi"]["autoAP"].containsKey("password") ||
+            !data["wifi"]["autoAP"].containsKey("timeout")) needsRewrite = true;
         wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
         wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;
 
+        if (!data.containsKey("callsign")) needsRewrite = true;
         callsign                        = data["callsign"] | "NOCALL-10";
-        rememberStationTime             = data["other"]["rememberStationTime"] | 30;
+        
+        if (!data["aprs_is"].containsKey("active") ||
+            !data["aprs_is"].containsKey("passcode") ||
+            !data["aprs_is"].containsKey("server") ||
+            !data["aprs_is"].containsKey("port") ||
+            !data["aprs_is"].containsKey("filter") ||
+            !data["aprs_is"].containsKey("messagesToRF") ||
+            !data["aprs_is"].containsKey("objectsToRF")) needsRewrite = true;
+        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;
 
+        if (!data["beacon"].containsKey("latitude") ||
+            !data["beacon"].containsKey("longitude") ||
+            !data["beacon"].containsKey("comment") ||
+            !data["beacon"].containsKey("interval") ||
+            !data["beacon"].containsKey("overlay") ||
+            !data["beacon"].containsKey("symbol") ||
+            !data["beacon"].containsKey("path") ||
+            !data["beacon"].containsKey("sendViaAPRSIS") ||
+            !data["beacon"].containsKey("sendViaRF") ||
+            !data["beacon"].containsKey("statusActive") ||
+            !data["beacon"].containsKey("statusPacket") ||
+            !data["beacon"].containsKey("gpsActive") ||
+            !data["beacon"].containsKey("gpsAmbiguity")) needsRewrite = true;
         beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
         beacon.longitude                = data["beacon"]["longitude"] | 0.0;
         beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
@@ -188,21 +226,19 @@ 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;
+        if (!data.containsKey("personalNote")) needsRewrite = true;
+        personalNote    	            = data["personalNote"] | "personal note here";
 
+        if (!data.containsKey("blacklist")) needsRewrite = true;
+        blacklist                       = data["blacklist"] | "station callsign";
+
+        if (!data["digi"].containsKey("mode") ||
+            !data["digi"].containsKey("ecoMode")) needsRewrite = true;
         digi.mode                       = data["digi"]["mode"] | 0;
         digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
         if (digi.ecoMode == 1) shouldSleepStop = false;
@@ -211,6 +247,14 @@ bool Configuration::readFile() {
             if (digi.ecoMode == 1) digi.ecoMode = 2;
         #endif
 
+        if (!data["lora"].containsKey("txFreq") ||
+            !data["lora"].containsKey("rxFreq") ||
+            !data["lora"].containsKey("spreadingFactor") ||
+            !data["lora"].containsKey("signalBandwidth") ||
+            !data["lora"].containsKey("codingRate4") ||
+            !data["lora"].containsKey("power") ||
+            !data["lora"].containsKey("txActive") ||
+            !data["lora"].containsKey("rxActive")) needsRewrite = true;
         loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
         loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
         loramodule.spreadingFactor      = data["lora"]["spreadingFactor"] | 12;
@@ -220,63 +264,100 @@ bool Configuration::readFile() {
         loramodule.txActive             = data["lora"]["txActive"] | false;
         loramodule.rxActive             = data["lora"]["rxActive"] | false;
 
+        if (!data["display"].containsKey("alwaysOn") ||
+            !data["display"].containsKey("timeout") ||
+            !data["display"].containsKey("turn180")) needsRewrite = true;
         display.alwaysOn                = data["display"]["alwaysOn"] | true;
         display.timeout                 = data["display"]["timeout"] | 4;
         display.turn180                 = data["display"]["turn180"] | false;
 
+        if (!data["battery"].containsKey("sendInternalVoltage") ||
+            !data["battery"].containsKey("monitorInternalVoltage") ||
+            !data["battery"].containsKey("internalSleepVoltage") ||
+            !data["battery"].containsKey("sendExternalVoltage") ||
+            !data["battery"].containsKey("externalVoltagePin") ||
+            !data["battery"].containsKey("monitorExternalVoltage") ||
+            !data["battery"].containsKey("externalSleepVoltage") ||
+            !data["battery"].containsKey("voltageDividerR1") ||
+            !data["battery"].containsKey("voltageDividerR2") ||
+            !data["battery"].containsKey("sendVoltageAsTelemetry")) needsRewrite = true;
         battery.sendInternalVoltage     = data["battery"]["sendInternalVoltage"] | false;
         battery.monitorInternalVoltage  = data["battery"]["monitorInternalVoltage"] | false;
         battery.internalSleepVoltage    = data["battery"]["internalSleepVoltage"] | 2.9;
-
         battery.sendExternalVoltage     = data["battery"]["sendExternalVoltage"] | false;
         battery.externalVoltagePin      = data["battery"]["externalVoltagePin"] | 34;
         battery.monitorExternalVoltage  = data["battery"]["monitorExternalVoltage"] | false;
         battery.externalSleepVoltage    = data["battery"]["externalSleepVoltage"] | 10.9;
         battery.voltageDividerR1        = data["battery"]["voltageDividerR1"] | 100.0;
         battery.voltageDividerR2        = data["battery"]["voltageDividerR2"] | 27.0;
-
         battery.sendVoltageAsTelemetry  = data["battery"]["sendVoltageAsTelemetry"] | false;
 
+        if (!data["wxsensor"].containsKey("active") ||
+            !data["wxsensor"].containsKey("heightCorrection") ||
+            !data["wxsensor"].containsKey("temperatureCorrection")) needsRewrite = true;
         wxsensor.active                 = data["wxsensor"]["active"] | false;
         wxsensor.heightCorrection       = data["wxsensor"]["heightCorrection"] | 0;
         wxsensor.temperatureCorrection  = data["wxsensor"]["temperatureCorrection"] | 0.0;
 
+        if (!data["syslog"].containsKey("active") ||
+            !data["syslog"].containsKey("server") ||
+            !data["syslog"].containsKey("port") ||
+            !data["syslog"].containsKey("logBeaconOverTCPIP")) needsRewrite = true;
         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;
-        
+
+        if (!data["tnc"].containsKey("enableServer") ||
+            !data["tnc"].containsKey("enableSerial") ||
+            !data["tnc"].containsKey("acceptOwn")) needsRewrite = true;
         tnc.enableServer                = data["tnc"]["enableServer"] | false;
         tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
         tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;
 
-        ota.username                    = data["ota"]["username"] | "";
-        ota.password                    = data["ota"]["password"] | "";
-
-        webadmin.active                 = data["webadmin"]["active"] | false;
-        webadmin.username               = data["webadmin"]["username"] | "admin";
-        webadmin.password               = data["webadmin"]["password"] | "";
-
-        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
-
-        backupDigiMode                  = data["other"]["backupDigiMode"] | false;
-
-        rebootMode                      = data["other"]["rebootMode"] | false;
-        rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
-
-        personalNote    	            = data["personalNote"] | "personal note here";
-
-        blacklist                       = data["blacklist"] | "station callsign";
-
-        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
-        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
-
+        if (!data["mqtt"].containsKey("active") ||
+            !data["mqtt"].containsKey("server") ||
+            !data["mqtt"].containsKey("topic") ||
+            !data["mqtt"].containsKey("username") ||
+            !data["mqtt"].containsKey("password") ||
+            !data["mqtt"].containsKey("port")) needsRewrite = true;
         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;
+        
+        if (!data["ota"].containsKey("username") ||
+            !data["ota"].containsKey("password")) needsRewrite = true;
+        ota.username                    = data["ota"]["username"] | "";
+        ota.password                    = data["ota"]["password"] | "";
+
+        if (!data["webadmin"].containsKey("active") ||
+            !data["webadmin"].containsKey("username") ||
+            !data["webadmin"].containsKey("password")) needsRewrite = true;
+        webadmin.active                 = data["webadmin"]["active"] | false;
+        webadmin.username               = data["webadmin"]["username"] | "admin";
+        webadmin.password               = data["webadmin"]["password"] | "";
+
+        if (!data["remoteManagement"].containsKey("managers") ||
+            !data["remoteManagement"].containsKey("rfOnly")) needsRewrite = true;
+        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
+        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
+
+        if (!data["ntp"].containsKey("gmtCorrection")) needsRewrite = true;
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
+
+        if (!data["other"].containsKey("rebootMode") ||
+            !data["other"].containsKey("rebootModeTime")) needsRewrite = true;
+        rebootMode                      = data["other"]["rebootMode"] | false;
+        rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
+
+        if (!data["other"].containsKey("rememberStationTime")) needsRewrite = true;
+        rememberStationTime             = data["other"]["rememberStationTime"] | 30;
+
+        if (!data["other"].containsKey("backupDigiMode")) needsRewrite = 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;
@@ -286,6 +367,13 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
         configFile.close();
+
+        if (needsRewrite) {
+            Serial.println("Config JSON incomplete, rewriting...");
+            writeFile();
+            delay(500);
+            ESP.restart();
+        } 
         Serial.println("Config read successfuly");
         return true;
     } else {
@@ -294,7 +382,7 @@ bool Configuration::readFile() {
     }
 }
     
-void Configuration::init() {
+void Configuration::setDefaultValues() {
 
     WiFi_AP wifiap;
     wifiap.ssid                     = "";
@@ -307,6 +395,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;
@@ -318,26 +414,18 @@ void Configuration::init() {
     beacon.path                     = "WIDE1-1";
 
     beacon.statusActive             = false;
-    beacon.statusPacket             = "";
+    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;
@@ -350,21 +438,7 @@ void Configuration::init() {
     display.alwaysOn                = true;
     display.timeout                 = 4;
     display.turn180                 = false;
-
-    syslog.active                   = false;
-    syslog.server                   = "lora.link9.net";
-    syslog.port                     = 1514;
-    syslog.logBeaconOverTCPIP       = false;
-
-    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;
@@ -378,23 +452,18 @@ 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                    = "";
-
-    blacklist                       = "";
-
-    webadmin.active                 = false;
-    webadmin.username               = "admin";
-    webadmin.password               = "";
-
-    ntp.gmtCorrection               = 0.0;
-
-    remoteManagement.managers       = "";
-    remoteManagement.rfOnly         = true;
+    tnc.enableServer                = false;
+    tnc.enableSerial                = false;
+    tnc.acceptOwn                   = false;
 
     mqtt.active                     = false;
     mqtt.server                     = "";
@@ -403,6 +472,25 @@ void Configuration::init() {
     mqtt.password                   = "";
     mqtt.port                       = 1883;
 
+    ota.username                    = "";
+    ota.password                    = "";
+
+    webadmin.active                 = false;
+    webadmin.username               = "admin";
+    webadmin.password               = "";
+
+    remoteManagement.managers       = "";
+    remoteManagement.rfOnly         = true;
+
+    ntp.gmtCorrection               = 0.0;
+
+    rebootMode                      = false;
+    rebootModeTime                  = 0;
+
+    rememberStationTime             = 30;
+
+    backupDigiMode                  = false;
+
     Serial.println("All is Written!");
 }
 
@@ -416,8 +504,9 @@ Configuration::Configuration() {
 
     bool exists = SPIFFS.exists("/igate_conf.json");
     if (!exists) {
-        init();
+        setDefaultValues();
         writeFile();
+        delay(500);
         ESP.restart();
     }
 

src/display.cpp

@@ -44,7 +44,12 @@
         #ifdef HAS_EPAPER
             #include <heltec-eink-modules.h>
             #include "Fonts/FreeSansBold9pt7b.h"
-            EInkDisplay_WirelessPaperV1_1 display;
+            #ifdef HELTEC_WP_V1
+                EInkDisplay_WirelessPaperV1_1 display;
+            #endif
+            /*#ifdef HELTEC_WP_V1_2         // SOON!
+                EInkDisplay_WirelessPaperV1_2 display;
+            #endif*/
             String lastEpaperText;
         #else
             #include <Adafruit_GFX.h>

src/mqtt_utils.cpp

@@ -65,7 +65,15 @@ namespace MQTT_Utils {
         }
         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())) {
+
+        bool connected = false;
+        if (!Config.mqtt.username.isEmpty()) {
+            connected = pubSub.connect(Config.callsign.c_str(), Config.mqtt.username.c_str(), Config.mqtt.password.c_str());
+        } else {
+            connected = pubSub.connect(Config.callsign.c_str());
+        }
+
+        if (connected) {
             Serial.println(" -> Connected !");
             const String subscribedTopic = Config.mqtt.topic + "/" + Config.callsign + "/#";
             if (!pubSub.subscribe(subscribedTopic.c_str())) {
@@ -74,7 +82,7 @@ namespace MQTT_Utils {
             Serial.print("Subscribed to MQTT topic : ");
             Serial.println(subscribedTopic);
         } else {
-            Serial.println(" -> Not Connected (Retry in 10 secs)");
+            Serial.println(" -> Not Connected (Retry in a few secs)");
         }
     }
 

src/power_utils.cpp

@@ -52,7 +52,7 @@ namespace POWER_Utils {
             #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)
+            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
             #endif
         }
@@ -61,7 +61,7 @@ namespace POWER_Utils {
             #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)
+            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
             #endif
         }
@@ -73,7 +73,7 @@ namespace POWER_Utils {
             #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)
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
                 digitalWrite(ADC_CTRL, LOW);
             #endif
         }
@@ -82,7 +82,7 @@ namespace POWER_Utils {
             #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)
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
                 digitalWrite(ADC_CTRL, HIGH);
             #endif
         }
@@ -296,18 +296,6 @@ namespace POWER_Utils {
             adc_ctrl_OFF();
         #endif
 
-        #if defined(HELTEC_WIRELESS_TRACKER)
-            Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-        #endif
-
-        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2)
-            Wire.begin(OLED_SDA, OLED_SCL);
-        #endif
-
-        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
-            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-        #endif
-
         #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
             pinMode(BOARD_POWERON, OUTPUT);
             digitalWrite(BOARD_POWERON, HIGH);
@@ -321,9 +309,20 @@ namespace POWER_Utils {
             digitalWrite(TFT_CS, HIGH);
 
             delay(500);
+        #endif
+
+        #ifdef USE_WIRE_WITH_OLED_PINS
+            Wire.begin(OLED_SDA, OLED_SCL);
+        #endif
+
+        #ifdef USE_WIRE_WITH_BOARD_I2C_PINS
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
+        #ifdef USE_WIRE1_WITH_BOARD_I2C_PINS
+            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #endif
+        
         delay(1000);
         BATTERY_Utils::setup();
         BATTERY_Utils::startupBatteryHealth();

src/query_utils.cpp

@@ -31,6 +31,7 @@ extern float                            snr;
 extern int                              freqError;
 extern bool                             shouldSleepLowVoltage;
 extern bool                             saveNewDigiEcoModeConfig;
+extern String                           versionNumber;
 
 
 namespace QUERY_Utils {
@@ -42,7 +43,9 @@ namespace QUERY_Utils {
         if (queryQuestion == "?APRS?" || queryQuestion == "H" || queryQuestion == "HELP" || queryQuestion=="?") {
             answer.concat("?APRSV ?APRSP ?APRSL ?APRSSSR ?EM=? ?TX=? "); // ?APRSH ?WHERE callsign
         } else if (queryQuestion == "?APRSV") {
-            answer.concat("CA2RXU_LoRa_iGate 3.0 v");
+            answer.concat("CA2RXU_LoRa_iGate v");
+            answer.concat(versionNumber);
+            answer.concat(" ");
             answer.concat(versionDate);
         } else if (queryQuestion == "?APRSP") {
             answer.concat("iGate QTH: ");

src/sleep_utils.cpp

@@ -51,7 +51,7 @@ namespace SLEEP_Utils {
         if (Config.digi.ecoMode == 1) {
             pinMode(RADIO_WAKEUP_PIN, INPUT);
             attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING);
-            #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa)
+            #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa)
                 esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
             #endif
             #if defined(HELTEC_HTCT62) || defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) || defined(ESP32_C3_OctopusLab_LoRa)

src/syslog_utils.cpp

@@ -25,6 +25,7 @@
 
 extern Configuration    Config;
 extern String           versionDate;
+extern String           versionNumber;
 
 WiFiUDP udpClient;
 
@@ -35,7 +36,9 @@ namespace SYSLOG_Utils {
         if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
             String syslogPacket = "<165>1 - ";
             syslogPacket.concat(Config.callsign);
-            syslogPacket.concat(" CA2RXU_LoRa_iGate_3.0 - - - "); //RFC5424 The Syslog Protocol
+            syslogPacket.concat(" CA2RXU_LoRa_iGate_");
+            syslogPacket.concat(versionNumber);
+            syslogPacket.concat(" - - - "); //RFC5424 The Syslog Protocol
 
             char signalData[35];
             snprintf(signalData, sizeof(signalData), " / %ddBm / %.2fdB / %dHz", rssi, snr, freqError);

src/tnc_utils.cpp

@@ -17,10 +17,12 @@
  */
 
 #include <WiFi.h>
+#include "ESPmDNS.h"
 #include "configuration.h"
 #include "station_utils.h"
 #include "kiss_protocol.h"
 #include "kiss_utils.h"
+#include "tnc_utils.h"
 #include "utils.h"
 
 
@@ -45,6 +47,17 @@ namespace TNC_Utils {
         if (Config.tnc.enableServer && Config.digi.ecoMode == 0) {
             tncServer.stop();
             tncServer.begin();
+            String host = "igate-" + Config.callsign;
+            if (!MDNS.begin(host.c_str())) {
+                Serial.println("Error Starting mDNS");
+                tncServer.stop();
+                return;
+            }
+            if (!MDNS.addService("tnc", "tcp", TNC_PORT)) {
+                Serial.println("Error: Could not add mDNS service");
+            }
+            Serial.println("TNC server started successfully");
+            Serial.println("mDNS Host: " + host + ".local");
         }
     }
 

src/utils.cpp

@@ -210,7 +210,7 @@ namespace Utils {
                 }
             #endif
 
-            #ifndef HELTEC_WP
+            #ifndef HELTEC_WP_V1
                 if (Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
                     float externalVoltage       = BATTERY_Utils::checkExternalVoltage();
                     if (Config.battery.monitorExternalVoltage && externalVoltage < Config.battery.externalSleepVoltage) {

src/web_utils.cpp

@@ -115,146 +115,199 @@ namespace WEB_Utils {
     }
 
     void handleWriteConfiguration(AsyncWebServerRequest *request) {
-        Serial.println("Got new config from www");
+        Serial.println("Got new Configuration Data from www");
 
-        int networks = request->getParam("wifi.APs", true)->value().toInt();
+        auto getParamStringSafe = [&](const String& name, const String& defaultValue = "") -> String {
+            if (request->hasParam(name, true)) {
+                return request->getParam(name, true)->value();
+            }
+            return defaultValue;
+        };
+
+        auto getParamIntSafe = [&](const String& name, int defaultValue = 0) -> int {
+            if (request->hasParam(name, true)) {
+                return request->getParam(name, true)->value().toInt();
+            }
+            return defaultValue;
+        };
+
+        auto getParamFloatSafe = [&](const String& name, float defaultValue = 0.0) -> float {
+            if (request->hasParam(name, true)) {
+                return request->getParam(name, true)->value().toFloat();
+            }
+            return defaultValue;
+        };
+
+        auto getParamDoubleSafe = [&](const String& name, double defaultValue = 0.0) -> double {
+            if (request->hasParam(name, true)) {
+                return request->getParam(name, true)->value().toDouble();
+            }
+            return defaultValue;
+        };
+
+        int networks = getParamIntSafe("wifi.APs");
 
         Config.wifiAPs = {};
 
-        for (int i=0; i<networks; i++) {
+        for (int i = 0; i < networks; i++) {
             WiFi_AP wifiap;
-            wifiap.ssid                   = request->getParam("wifi.AP." + String(i) + ".ssid", true)->value();
-            wifiap.password               = request->getParam("wifi.AP." + String(i) + ".password", true)->value();
+            wifiap.ssid                   = getParamStringSafe("wifi.AP." + String(i) + ".ssid");
+            wifiap.password               = getParamStringSafe("wifi.AP." + String(i) + ".password");
 
             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.callsign                     = getParamStringSafe("callsign", Config.callsign);
+        
+        Config.wifiAutoAP.password          = getParamStringSafe("wifi.autoAP.password", Config.wifiAutoAP.password);
+        Config.wifiAutoAP.timeout           = getParamIntSafe("wifi.autoAP.timeout", Config.wifiAutoAP.timeout);
 
         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);
+        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           = getParamStringSafe("aprs_is.server", Config.aprs_is.server);
+            Config.aprs_is.passcode         = getParamStringSafe("aprs_is.passcode", Config.aprs_is.passcode);
+            Config.aprs_is.port             = getParamIntSafe("aprs_is.port", Config.aprs_is.port);
+            Config.aprs_is.filter           = getParamStringSafe("aprs_is.filter", Config.aprs_is.filter);
+        }
 
-
-        Config.beacon.interval              = request->getParam("beacon.interval", true)->value().toInt();
+        Config.beacon.interval              = getParamIntSafe("beacon.interval", Config.beacon.interval);
         Config.beacon.sendViaAPRSIS         = request->hasParam("beacon.sendViaAPRSIS", true);
         Config.beacon.sendViaRF             = request->hasParam("beacon.sendViaRF", true);
-        Config.beacon.latitude              = request->getParam("beacon.latitude", true)->value().toDouble();
-        Config.beacon.longitude             = request->getParam("beacon.longitude", true)->value().toDouble();
-        Config.beacon.comment               = request->getParam("beacon.comment", true)->value();
-        Config.beacon.overlay               = request->getParam("beacon.overlay", true)->value();
-        Config.beacon.symbol                = request->getParam("beacon.symbol", true)->value();
-        Config.beacon.path                  = request->getParam("beacon.path", true)->value();
+        Config.beacon.latitude              = getParamDoubleSafe("beacon.latitude", Config.beacon.latitude);
+        Config.beacon.longitude             = getParamDoubleSafe("beacon.longitude", Config.beacon.longitude);
+        Config.beacon.comment               = getParamStringSafe("beacon.comment", Config.beacon.comment);
+        Config.beacon.overlay               = getParamStringSafe("beacon.overlay", Config.beacon.overlay);
+        Config.beacon.symbol                = getParamStringSafe("beacon.symbol", Config.beacon.symbol);
+        Config.beacon.path                  = getParamStringSafe("beacon.path", Config.beacon.path);
 
         Config.beacon.statusActive          = request->hasParam("beacon.statusActive", true);
-        Config.beacon.statusPacket          = request->getParam("beacon.statusPacket", true)->value();
+        if (Config.beacon.statusActive) {
+            Config.beacon.statusPacket      = getParamStringSafe("beacon.statusPacket", Config.beacon.statusPacket);
+        }
 
         Config.beacon.gpsActive             = request->hasParam("beacon.gpsActive", true);
         Config.beacon.gpsAmbiguity          = request->hasParam("beacon.gpsAmbiguity", true);
 
+        Config.personalNote                 = getParamStringSafe("personalNote", Config.personalNote);
 
-        Config.digi.mode                    = request->getParam("digi.mode", true)->value().toInt();
-        Config.digi.ecoMode                 = request->getParam("digi.ecoMode", true)->value().toInt();;
+        Config.blacklist                    = getParamStringSafe("blacklist", Config.blacklist);
 
+        Config.digi.mode                    = getParamIntSafe("digi.mode", Config.digi.mode);
+        Config.digi.ecoMode                 = getParamIntSafe("digi.ecoMode", Config.digi.ecoMode);
 
-        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();
-        Config.loramodule.signalBandwidth   = request->getParam("lora.signalBandwidth", true)->value().toInt();
-        Config.loramodule.codingRate4       = request->getParam("lora.codingRate4", true)->value().toInt();
-        Config.loramodule.power             = request->getParam("lora.power", true)->value().toInt();
+        Config.loramodule.txFreq            = getParamIntSafe("lora.txFreq", Config.loramodule.txFreq);
+        Config.loramodule.rxFreq            = getParamIntSafe("lora.rxFreq", Config.loramodule.rxFreq);
+        Config.loramodule.spreadingFactor   = getParamIntSafe("lora.spreadingFactor", Config.loramodule.spreadingFactor);
+        Config.loramodule.signalBandwidth   = getParamIntSafe("lora.signalBandwidth", Config.loramodule.signalBandwidth);
+        Config.loramodule.codingRate4       = getParamIntSafe("lora.codingRate4", Config.loramodule.codingRate4);
+        Config.loramodule.power             = getParamIntSafe("lora.power", Config.loramodule.power);
         Config.loramodule.txActive          = request->hasParam("lora.txActive", true);
         Config.loramodule.rxActive          = request->hasParam("lora.rxActive", true);
 
 
-        Config.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          = getParamIntSafe("display.timeout", Config.display.timeout);
         }
-        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();
+        Config.battery.sendInternalVoltage          = request->hasParam("battery.sendInternalVoltage", true);
+        Config.battery.monitorInternalVoltage       = request->hasParam("battery.monitorInternalVoltage", true);
+        if (Config.battery.monitorInternalVoltage) {
+            Config.battery.internalSleepVoltage     = getParamFloatSafe("battery.internalSleepVoltage", Config.battery.internalSleepVoltage);
+        }
 
-        Config.battery.sendExternalVoltage      = request->hasParam("battery.sendExternalVoltage", true);
+        Config.battery.sendExternalVoltage          = request->hasParam("battery.sendExternalVoltage", true);
         if (Config.battery.sendExternalVoltage) {
-            Config.battery.externalVoltagePin   = request->getParam("battery.externalVoltagePin", true)->value().toInt();
-            Config.battery.voltageDividerR1     = request->getParam("battery.voltageDividerR1", true)->value().toFloat();
-            Config.battery.voltageDividerR2     = request->getParam("battery.voltageDividerR2", true)->value().toFloat();
+            Config.battery.externalVoltagePin       = getParamIntSafe("battery.externalVoltagePin", Config.battery.externalVoltagePin);
+            Config.battery.voltageDividerR1         = getParamFloatSafe("battery.voltageDividerR1", Config.battery.voltageDividerR1);
+            Config.battery.voltageDividerR2         = getParamFloatSafe("battery.voltageDividerR2", Config.battery.voltageDividerR2);
         }
-        Config.battery.monitorExternalVoltage   = request->hasParam("battery.monitorExternalVoltage", true);
-        Config.battery.externalSleepVoltage     = request->getParam("battery.externalSleepVoltage", true)->value().toFloat();
+        Config.battery.monitorExternalVoltage       = request->hasParam("battery.monitorExternalVoltage", true);
+        if (Config.battery.monitorExternalVoltage) {
+            Config.battery.externalSleepVoltage     = getParamFloatSafe("battery.externalSleepVoltage", Config.battery.externalSleepVoltage);
+        }
+        Config.battery.sendVoltageAsTelemetry       = request->hasParam("battery.sendVoltageAsTelemetry", true);
 
-        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        = getParamIntSafe("wxsensor.heightCorrection", Config.wxsensor.heightCorrection);
+            Config.wxsensor.temperatureCorrection   = getParamFloatSafe("wxsensor.temperatureCorrection", Config.wxsensor.temperatureCorrection);
             Config.beacon.symbol = "_";
         }
 
+
         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                = getParamStringSafe("syslog.server", Config.syslog.server);
+            Config.syslog.port                  = getParamIntSafe("syslog.port", Config.syslog.port);
             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.mqtt.active                  = request->hasParam("mqtt.active", true);
+        if (Config.mqtt.active) {
+            Config.mqtt.server              = getParamStringSafe("mqtt.server", Config.mqtt.server);
+            Config.mqtt.topic               = getParamStringSafe("mqtt.topic", Config.mqtt.topic);
+            Config.mqtt.username            = getParamStringSafe("mqtt.username", Config.mqtt.username);
+            Config.mqtt.password            = getParamStringSafe("mqtt.password", Config.mqtt.password);
+            Config.mqtt.port                = getParamIntSafe("mqtt.port", Config.mqtt.port);
+        }
+
+
         Config.rebootMode                   = request->hasParam("other.rebootMode", true);
-        Config.rebootModeTime               = request->getParam("other.rebootModeTime", true)->value().toInt();
+        if (Config.rebootMode) {
+            Config.rebootModeTime           = getParamIntSafe("other.rebootModeTime", Config.rebootModeTime);
+        }
 
-        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.backupDigiMode               = request->hasParam("other.backupDigiMode", true);
-
-        Config.personalNote                 = request->getParam("personalNote", true)->value();
-
-        Config.blacklist                    = request->getParam("blacklist", true)->value();
+        Config.ota.username                 = getParamStringSafe("ota.username", Config.ota.username);
+        Config.ota.password                 = getParamStringSafe("ota.password", Config.ota.password);
 
         Config.webadmin.active              = request->hasParam("webadmin.active", true);
         if (Config.webadmin.active) {
-            Config.webadmin.username        = request->getParam("webadmin.username", true)->value();
-            Config.webadmin.password        = request->getParam("webadmin.password", true)->value();
+            Config.webadmin.username        = getParamStringSafe("webadmin.username", Config.webadmin.username);
+            Config.webadmin.password        = getParamStringSafe("webadmin.password", Config.webadmin.password);
         }
 
-        Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();
-
-        Config.remoteManagement.managers    = request->getParam("remoteManagement.managers", true)->value();
+        Config.remoteManagement.managers    = getParamStringSafe("remoteManagement.managers", Config.remoteManagement.managers);
         Config.remoteManagement.rfOnly      = request->hasParam("remoteManagement.rfOnly", true);
 
-        Config.mqtt.active                  = request->hasParam("mqtt.active", true);
-        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.ntp.gmtCorrection            = getParamFloatSafe("ntp.gmtCorrection", Config.ntp.gmtCorrection);
 
-        Config.writeFile();
+        Config.rememberStationTime          = getParamIntSafe("other.rememberStationTime", Config.rememberStationTime);
 
-        AsyncWebServerResponse *response    = request->beginResponse(302, "text/html", "");
-        response->addHeader("Location", "/");
-        request->send(response);
-        displayToggle(false);
-        delay(200);
-        ESP.restart();
+        Config.backupDigiMode               = request->hasParam("other.backupDigiMode", true);
+        
+        bool saveSuccess = Config.writeFile();
+
+        if (saveSuccess) {
+            Serial.println("Configuration saved successfully");
+            AsyncWebServerResponse *response = request->beginResponse(302, "text/html", "");
+            response->addHeader("Location", "/?success=1");
+            request->send(response);
+            
+            displayToggle(false);
+            delay(500);
+            ESP.restart();
+        } else {
+            Serial.println("Error saving configuration!");
+            String errorPage = "<!DOCTYPE html><html><head><title>Error</title></head><body>";
+            errorPage += "<h1>Configuration Error:</h1>";
+            errorPage += "<p>Couldn't save new configuration. Please try again.</p>";
+            errorPage += "<a href='/'>Back</a></body></html>";
+            
+            AsyncWebServerResponse *response = request->beginResponse(500, "text/html", errorPage);
+            request->send(response);
+        }
     }
 
     void handleAction(AsyncWebServerRequest *request) {

src/wx_utils.cpp

@@ -71,6 +71,7 @@ namespace WX_Utils {
                 #endif
                 err = Wire.endTransmission();
             #endif
+            delay(5);
             if (err == 0) {
                 //Serial.println(addr); //this shows any connected board to I2C
                 if (addr == 0x76 || addr == 0x77) { // BME or BMP

variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h

@@ -32,6 +32,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_NUM_3
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_1W_LoRa/board_pinout.h

@@ -34,6 +34,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_12
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_1W_LoRa_915/board_pinout.h

@@ -34,8 +34,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_12
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
-    #define HAS_DISPLAY    
+    #define HAS_DISPLAY
 
     #undef  OLED_SDA
     #undef  OLED_SCL

variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h

@@ -34,6 +34,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_12
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
     

variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h

@@ -34,6 +34,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_33
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_LoRa/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_LoRa_915/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_LoRa_A7670/board_pinout.h

@@ -28,6 +28,9 @@
     #define RADIO_RST_PIN           0
     #define RADIO_BUSY_PIN          32
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h

@@ -28,6 +28,9 @@
     #define RADIO_RST_PIN           0
     #define RADIO_BUSY_PIN          32
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display    
     #define HAS_DISPLAY
 

variants/LoRaHAM_V2/board_pinout.h

@@ -0,0 +1,50 @@
+/* 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 BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          36
+    #define RADIO_MISO_PIN          37
+    #define RADIO_MOSI_PIN          35
+    #define RADIO_CS_PIN            34
+    #define RADIO_RST_PIN           2
+    #define RADIO_BUSY_PIN          3
+    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_3
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    //#define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        39
+
+#endif

variants/LoRaHAM_V2/platformio.ini

@@ -0,0 +1,8 @@
+[env:LoRaHAM_V2]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D LoRaHAM_V2
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/OE5HWN_MeshCom/board_pinout.h

@@ -34,6 +34,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_33
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/QRPLabs_LightGateway_1_0/board_pinout.h

@@ -34,6 +34,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_5
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h

@@ -35,6 +35,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_5
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/TROY_LoRa_APRS/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN    RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN     GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/WEMOS-D1-R32-RA02/board_pinout.h

@@ -31,6 +31,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_12
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h

@@ -30,7 +30,10 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_25
 
-    //  Display    
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
     #define HAS_DISPLAY
 
     #undef  OLED_SDA

variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h

@@ -30,6 +30,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_38
 
+    //  I2C
+    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           11
+    #define BOARD_I2C_SCL           12
+
     //  Aditional Config
     #define INTERNAL_LED_PIN        15
 

variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h

@@ -36,5 +36,10 @@
 
     #define BUTTON_PIN          21
     #define INTERNAL_LED_PIN    48
-    
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+    #define OLED_SDA            5
+    #define OLED_SCL            6
+
 #endif

variants/heltec-lora32-v2/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/heltec_wifi_lora_32_V3/board_pinout.h

@@ -31,6 +31,12 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
     //  Display
     #define HAS_DISPLAY
 
@@ -48,7 +54,5 @@
     #define BATTERY_PIN             1
     #define VEXT_CTRL               36
     #define ADC_CTRL                37
-    #define BOARD_I2C_SDA           41
-    #define BOARD_I2C_SCL           42
 
 #endif

variants/heltec_wifi_lora_32_V3_2/board_pinout.h

@@ -31,6 +31,12 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
     //  Display
     #define HAS_DISPLAY
 
@@ -48,7 +54,5 @@
     #define BATTERY_PIN             1
     #define VEXT_CTRL               36
     #define ADC_CTRL                37
-    #define BOARD_I2C_SDA           41
-    #define BOARD_I2C_SCL           42
 
 #endif

variants/heltec_wireless_bridge/board_pinout.h

@@ -0,0 +1,55 @@
+/* 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 BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1276
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_26
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        16
+    /*
+    Green LED (Lora): PIN 22 / GPIO2
+    Yellow LED (Wifi): PIN 23 / GPIO0
+    Blue LED (BT/BLE): PIN 25 / GPIO16
+    */
+    
+#endif

variants/heltec_wireless_bridge/platformio.ini

@@ -0,0 +1,8 @@
+[env:heltec_wireless_bridge]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D HELTEC_WIRELESS_BRIDGE
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wireless_paper_v1/board_pinout.h

@@ -31,6 +31,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           37
+    #define BOARD_I2C_SCL           36
+
     //  Display
     #define HAS_DISPLAY
     #define HAS_EPAPER
@@ -46,7 +51,5 @@
     #define BATTERY_PIN             20
     #define ADC_CTRL                19
     #define VEXT_CTRL               45
-    #define BOARD_I2C_SDA           37
-    #define BOARD_I2C_SCL           36
 
 #endif

variants/heltec_wireless_paper_v1/platformio.ini

@@ -1,10 +1,10 @@
-[env:heltec_wireless_paper]
+[env:heltec_wireless_paper_v1]
 board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags =
 	${common.build_flags}
-	-D HELTEC_WP
+	-D HELTEC_WP_V1
 	-D WIRELESS_PAPER
 lib_deps =
 	${common.lib_deps}
-	todd-herbert/heltec-eink-modules@^4.4.0
+	todd-herbert/heltec-eink-modules @ 4.5.0

variants/heltec_wireless_stick/board_pinout.h

@@ -31,6 +31,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/heltec_wireless_stick_lite_v3/board_pinout.h

@@ -31,12 +31,15 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
     #define VEXT_CTRL               36
     #define ADC_CTRL                37
-    #define BOARD_I2C_SDA           41
-    #define BOARD_I2C_SCL           42
 
 #endif

variants/heltec_wireless_stick_lite_v3_display/board_pinout.h

@@ -31,6 +31,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
 
+    //  I2C
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
     //  Display
     #define HAS_DISPLAY
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
@@ -40,7 +45,5 @@
     #define BATTERY_PIN             1
     #define VEXT_CTRL               36
     #define ADC_CTRL                37
-    #define BOARD_I2C_SDA           41
-    #define BOARD_I2C_SCL           42
 
 #endif

variants/heltec_wireless_tracker/board_pinout.h

@@ -30,6 +30,11 @@
     #define RADIO_BUSY_PIN          13      // SX1262 BUSY
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_14
+
+    //  I2C
+    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           7
+    #define BOARD_I2C_SCL           6
     
     //  Display
     #define HAS_DISPLAY
@@ -40,8 +45,6 @@
     #define BATTERY_PIN             1    
     #define ADC_CTRL                2   // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1
     #define VEXT_CTRL               3   // To turn on GPS and TFT
-    #define BOARD_I2C_SDA           7
-    #define BOARD_I2C_SCL           6
 
     //  GPS
     #define HAS_GPS

variants/ttgo-lora32-v21/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 
@@ -43,7 +46,7 @@
 
     //  Aditional Config
     #define INTERNAL_LED_PIN        25      // Green Led
-    #define BATTERY_PIN             35   
-	#define HAS_ADC_CALIBRATION    
+    #define BATTERY_PIN             35
+	#define HAS_ADC_CALIBRATION
 
 #endif

variants/ttgo-lora32-v21_915/board_pinout.h

@@ -30,6 +30,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_26
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ttgo_lora32_t3s3_v1_2/board_pinout.h

@@ -31,6 +31,9 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_33
 
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
     //  Display
     #define HAS_DISPLAY
 

variants/ttgo_t_deck_GPS/board_pinout.h

@@ -31,6 +31,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_45
 
+    //  I2C
+    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           18
+    #define BOARD_I2C_SCL           8
+
     //  Display
     #define HAS_DISPLAY
     #define HAS_TFT
@@ -50,7 +55,4 @@
     #define BOARD_SDCARD_CS         39
     #define BOARD_BL_PIN            42
 
-    #define BOARD_I2C_SDA           18
-    #define BOARD_I2C_SCL           8
-
 #endif

variants/ttgo_t_deck_plus/board_pinout.h

@@ -31,6 +31,11 @@
     #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
     #define GPIO_WAKEUP_PIN         GPIO_SEL_45
 
+    //  I2C
+    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           18
+    #define BOARD_I2C_SCL           8
+
     //  Display
     #define HAS_DISPLAY
     #define HAS_TFT
@@ -51,7 +56,4 @@
     #define BOARD_SDCARD_CS         39
     #define BOARD_BL_PIN            42
 
-    #define BOARD_I2C_SDA           18
-    #define BOARD_I2C_SCL           8
-
 #endif