beacon Freq on digi mod

Update README.md

.github/workflows/build.yml

@@ -29,6 +29,8 @@ jobs:
                       chip: esp32s3
                     - name: heltec_wireless_stick_lite_v3_display
                       chip: esp32s3
+                    - name: heltec_wireless_bridge
+                      chip: esp32
                     - name: ESP32_DIY_LoRa
                       chip: esp32
                     - name: ESP32_DIY_LoRa_915
@@ -67,7 +69,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

@@ -9,46 +9,38 @@ __(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a
 
 ____________________________________________________
 
+# <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">WEB FLASHER/INSTALLER</a>
+
+
+# <a href="https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/manual/LoRa_APRS_iGate_CA2RXU_Firmware_Manual.pdf" target="_blank">LoRa APRS iGate CA2RXU Firmware Manual</a>
+
+____________________________________________________
+
 ## You can support this project to continue to grow:
 
 [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/github-sponsors.png">](https://github.com/sponsors/richonguzman)     [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/paypalme.png">](http://paypal.me/richonguzman)
 
-<br />
-
-# WEB FLASHER/INSTALLER is <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">here</a>
-
 ____________________________________________________
 
-# WIKI
-
-### FAQ, BME280, TNC and more --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/00.-FAQ-(frequently-asked-questions)" target="_blank">here</a>.
-
-### Installation Guide --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/01.-Installation-Guide" target="_blank">here</a>.
-<br />
-
-# SUPPORTED BOARDS
-
-### Buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/108.-Supported-Boards-and-Buying-Links" target="_blank">here</a>.
+## SUPPORTED BOARDS (<a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/Supported-Boards-and-Buying-Links" target="_blank">Buying links</a>).
 
 (NOTE: all boards with 433-868-915 MHz versions)
 
 - TTGO Lilygo LoRa32 T3S3 V1.2 and LoRa32 V2.1 (V1.6 is the same).
 
-- TTGO T-Beam V1.0 , V1.1, V1.2 (also variations with SX1262 and SX1268 LoRa Modules).
+- TTGO T-Beam V1.0 , V1.1, V1.2 (also variations with SX1262 and SX1268 LoRa Modules) and Supreme V3.
 
 - T-Deck Plus (and also regular T-Deck with/without GPS).
 
 - HELTEC V2, V3, V3.2, T114, Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker, Wireless Paper.
 
-- RAK Wireless 4631 + 19007(19003)
+- RAK Wireless 4631 + 19007(or 19003)
 
-- Faketec (NRF52840 + Heltec HTRA62(SX1262))
+- Faketec V3 (NRF52840 + Heltec HTRA62(SX1262))
 
 - QRP Labs LightGateway 1.0 and Plus 1.0.
 
-- Faketec V3 (NRF52840 + Heltec HTRA62 SX1262)
-
-- ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
+- ESP32 + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
 
 - ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version.
 
@@ -58,8 +50,12 @@ ____________________________________________________
 
 <br />
 
-## Timeline (Versions):
+# Timeline (Versions):
 
+- 2025-10-11 User defined NTP server and send beacon over MQTT added.
+- 2025-10-10 Changed Wiki into a pdf manual.
+- 2025-09-26 Heltec Wireless Bridge support added.
+- 2025-09-09 MQTT added (pub+sub), Status defined by Op now and many fixes more.
 - 2025-06-20 Digipeaters now with updated EcoMode (Board Sleeps until packet Rx reducing current consumption to almost 10% at idle).
 - 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

@@ -35,7 +35,8 @@
     "blacklist": "",
     "digi": {
         "mode": 0,
-        "ecoMode": 0
+        "ecoMode": 0,
+        "beaconOnRxFreq": false
     },
     "lora": {
         "txFreq": 433775000,
@@ -86,7 +87,8 @@
         "topic": "",
         "username": "",
         "password": "",
-        "port": 1883
+        "port": 1883,
+        "beaconOverMqtt": false
     },
     "ota": {
         "username": "",
@@ -101,12 +103,14 @@
         "rfOnly": true
     },
     "ntp": {
+        "server": "pool.ntp.org",
         "gmtCorrection": 0.0
     },
     "other": {
         "rememberStationTime": 30,
         "backupDigiMode": false,
         "rebootMode": false,
-        "rebootModeTime": 6
+        "rebootModeTime": 6,
+        "startupDelay": 0
     }
 }

data_embed/index.html

@@ -344,6 +344,28 @@
                                         </button>
                                     </div>
                                 </div>
+                                <div class="col-6">
+                                    <label
+                                        for="startupDelay"
+                                        class="form-label"
+                                        >Startup Delay<small>(To Allow Router/Modem to start WiFiAP before connection)</small></label
+                                    >
+                                    <div class="input-group">
+                                        <input
+                                            type="number"
+                                            name="startupDelay"
+                                            id="startupDelay"
+                                            placeholder="0"
+                                            class="form-control"
+                                            step="1"
+                                            min="0"
+                                            max="5"
+                                        />
+                                        <span class="input-group-text"
+                                            >minutes</span
+                                        >
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <hr>
@@ -716,6 +738,28 @@
                                             </option>
                                         </select>
                                     </div>
+                                    <div class="col-12 mt-3">
+                                        <label
+                                            for="digi.beaconOnRxFreq"
+                                            class="form-label"
+                                            >Digipeater Beacon Frequency
+                                            <small
+                                                >(If Rx Freq different from Tx Freq).</small
+                                            ></label
+                                        >
+                                        <select
+                                            class="form-select form-select"
+                                            name="digi.beaconOnRxFreq"
+                                            id="digi.beaconOnRxFreq"
+                                        >
+                                            <option value="false">
+                                                Beacon on Tx Freq
+                                            </option>
+                                            <option value="true">
+                                                Beacon on Rx Freq
+                                            </option>
+                                        </select>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -1416,7 +1460,7 @@
                                             <label
                                                 for="syslog.logBeaconOverTCPIP"
                                                 class="form-label"
-                                                >Log Beacon over TPCIP</label
+                                                >Log Beacon over TCP/IP</label
                                             >
                                         </div>
                                     </div>
@@ -1641,6 +1685,21 @@
                                             Default is <strong>1883</strong>
                                         </div>
                                     </div>
+                                    <div class="col-12 mt-3">
+                                        <div class="form-check form-switch">
+                                            <input
+                                                type="checkbox"
+                                                name="mqtt.beaconOverMqtt"
+                                                id="mqtt.beaconOverMqtt"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="mqtt.beaconOverMqtt"
+                                                class="form-label"
+                                                >Send iGate Beacon to MQTT</label
+                                            >
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -1990,6 +2049,21 @@
                                 </small>
                             </div>
                             <div class="col-lg-9 col-sm-12">
+                                <div class="col-12">
+                                    <label
+                                        for="ntp.server"
+                                        class="form-label"
+                                        >NTP Server hostname</label
+                                    >
+                                    <div class="input-group">
+                                        <input
+                                            type="text"
+                                            name="ntp.server"
+                                            id="ntp.server"
+                                            class="form-control"
+                                        />
+                                    </div>
+                                </div>
                                 <div class="col-12">
                                     <label
                                         for="ntp.gmtCorrection"

data_embed/script.js

@@ -95,6 +95,7 @@ function loadSettings(settings) {
         networksContainer.appendChild(networkElement);
         networkCount++;
     });
+    document.getElementById("startupDelay").value                       = settings.startupDelay;
 
     // APRS-IS
     document.getElementById("aprs_is.active").checked                   = settings.aprs_is.active;
@@ -134,6 +135,7 @@ function loadSettings(settings) {
     // Digi
     document.getElementById("digi.mode").value                          = settings.digi.mode;
     document.getElementById("digi.ecoMode").value                       = settings.digi.ecoMode;
+    document.getElementById("digi.beaconOnRxFreq").value                = settings.digi.beaconOnRxFreq;
 
     // LoRa
     document.getElementById("lora.txFreq").value                        = settings.lora.txFreq;
@@ -207,12 +209,14 @@ function loadSettings(settings) {
     document.getElementById("mqtt.username").value                      = settings.mqtt.username;
     document.getElementById("mqtt.password").value                      = settings.mqtt.password;
     document.getElementById("mqtt.port").value                          = settings.mqtt.port;
-    MqttCheckbox.checked    = settings.mqtt.active;
-    MqttServer.disabled     = !MqttCheckbox.check;
-    MqttTopic.disabled      = !MqttCheckbox.check;
-    MqttUsername.disabled   = !MqttCheckbox.check;
-    MqttPassword.disabled   = !MqttCheckbox.check;
-    MqttPort.disabled       = !MqttCheckbox.check;
+    document.getElementById("mqtt.beaconOverMqtt").value                = settings.mqtt.beaconOverMqtt;
+    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;
+    MqttBeaconOverMqtt.disabled = !MqttCheckbox.check;
 
     // Reboot
     document.getElementById("other.rebootMode").checked                 = settings.other.rebootMode;
@@ -241,6 +245,7 @@ function loadSettings(settings) {
     document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
 
     // NTP
+    document.getElementById("ntp.server").value                         = settings.ntp.server;
     document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
 
     // Experimental
@@ -379,12 +384,14 @@ const MqttTopic                 = document.querySelector('input[name="mqtt.topic
 const MqttUsername              = document.querySelector('input[name="mqtt.username"]');
 const MqttPassword              = document.querySelector('input[name="mqtt.password"]');
 const MqttPort                  = document.querySelector('input[name="mqtt.port"]');
+const MqttBeaconOverMqtt        = document.querySelector('input[name="mqtt.beaconOverMqtt"]');
 MqttCheckbox.addEventListener("change", function () {
     MqttServer.disabled         = !this.checked;
     MqttTopic.disabled          = !this.checked;
     MqttUsername.disabled       = !this.checked;
     MqttPassword.disabled       = !this.checked;
     MqttPort.disabled           = !this.checked;
+    MqttBeaconOverMqtt.disabled = !this.checked;
 });
 
 // Reboot Switches

include/configuration.h

@@ -68,6 +68,7 @@ class DIGI {
 public:
     int     mode;
     int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)
+    bool    beaconOnRxFreq;
 };
 
 class LoraModule {
@@ -140,6 +141,7 @@ public:
 
 class NTP {
 public:
+    String  server;
     float   gmtCorrection;
 };
 
@@ -157,6 +159,7 @@ public:
     String  username;
     String  password;
     int     port;
+    bool    beaconOverMqtt;
 };
 
 class Configuration {
@@ -166,6 +169,7 @@ public:
     bool                    backupDigiMode;
     bool                    rebootMode;
     int                     rebootModeTime;
+    int                     startupDelay;
     String                  personalNote;
     String                  blacklist;
     std::vector<WiFi_AP>    wifiAPs;
@@ -185,8 +189,8 @@ public:
     REMOTE_MANAGEMENT       remoteManagement;
     MQTT                    mqtt;
 
-    void init();
-    void writeFile();
+    void setDefaultValues();
+    bool writeFile();
     Configuration();
 
 private:

include/station_utils.h

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

include/utils.h

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

src/LoRa_APRS_iGate.cpp

@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-09-02";
-String              versionNumber           = "3.1";
+String              versionDate             = "2025-10-12";
+String              versionNumber           = "3.1.3";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -97,7 +97,6 @@ bool                modemLoggedToAPRSIS     = false;
 std::vector<ReceivedPacket> receivedPackets;
 
 String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
-//#define STARTUP_DELAY 5 //min
 
 
 void setup() {
@@ -108,12 +107,7 @@ void setup() {
     Utils::validateFreqs();
     GPS_Utils::setup();
     STATION_Utils::loadBlacklistAndManagers();
-
-    #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
-        displayShow("", "  STARTUP DELAY ...", "", "", 0);
-        delay(STARTUP_DELAY * 60 * 1000);
-    #endif
-
+    Utils::startupDelay();
     SLEEP_Utils::setup();
     WIFI_Utils::setup();
     NTP_Utils::setup();

src/configuration.cpp

@@ -26,138 +26,153 @@
 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["other"]["startupDelay"]               = startupDelay;
 
-    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["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
+        data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
-    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;
+        callsign.trim();
+        callsign.toUpperCase();
+        data["callsign"]                            = callsign;
 
-    data["beacon"]["statusActive"]              = beacon.statusActive;
-    data["beacon"]["statusPacket"]              = beacon.statusPacket;
+        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"]["gpsActive"]                 = beacon.gpsActive;
-    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
+        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["personalNote"]                        = personalNote;
+        data["beacon"]["statusActive"]              = beacon.statusActive;
+        data["beacon"]["statusPacket"]              = beacon.statusPacket;
 
-    data["blacklist"]                           = blacklist;
+        data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+        data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
 
-    data["digi"]["mode"]                        = digi.mode;
-    data["digi"]["ecoMode"]                     = digi.ecoMode;
-    #if defined(HAS_A7670)
-        if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
-    #endif
+        data["personalNote"]                        = personalNote;
 
-    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["blacklist"]                           = blacklist;
 
-    data["display"]["alwaysOn"]                 = display.alwaysOn;
-    data["display"]["timeout"]                  = display.timeout;
-    data["display"]["turn180"]                  = display.turn180;
+        data["digi"]["mode"]                        = digi.mode;
+        data["digi"]["ecoMode"]                     = digi.ecoMode;
+        #if defined(HAS_A7670)
+            if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
+        #endif
+        data["digi"]["beaconOnRxFreq"]              = digi.beaconOnRxFreq;
 
-    data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
-    data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
-    data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
+        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"]["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["display"]["alwaysOn"]                 = display.alwaysOn;
+        data["display"]["timeout"]                  = display.timeout;
+        data["display"]["turn180"]                  = display.turn180;
 
-    data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
+        data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
+        data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
+        data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
 
-    data["wxsensor"]["active"]                  = wxsensor.active;
-    data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
-    data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
+        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["syslog"]["active"]                    = syslog.active;
-    data["syslog"]["server"]                    = syslog.server;
-    data["syslog"]["port"]                      = syslog.port;
-    data["syslog"]["logBeaconOverTCPIP"]        = syslog.logBeaconOverTCPIP;
+        data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
 
-    data["tnc"]["enableServer"]                 = tnc.enableServer;
-    data["tnc"]["enableSerial"]                 = tnc.enableSerial;
-    data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
+        data["wxsensor"]["active"]                  = wxsensor.active;
+        data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
+        data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
 
-    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["syslog"]["active"]                    = syslog.active;
+        data["syslog"]["server"]                    = syslog.server;
+        data["syslog"]["port"]                      = syslog.port;
+        data["syslog"]["logBeaconOverTCPIP"]        = syslog.logBeaconOverTCPIP;
 
-    data["ota"]["username"]                     = ota.username;
-    data["ota"]["password"]                     = ota.password;
+        data["tnc"]["enableServer"]                 = tnc.enableServer;
+        data["tnc"]["enableSerial"]                 = tnc.enableSerial;
+        data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
 
-    data["webadmin"]["active"]                  = webadmin.active;
-    data["webadmin"]["username"]                = webadmin.username;
-    data["webadmin"]["password"]                = webadmin.password;
+        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["mqtt"]["beaconOverMqtt"]              = mqtt.beaconOverMqtt;
 
-    data["remoteManagement"]["managers"]        = remoteManagement.managers;
-    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
+        data["ota"]["username"]                     = ota.username;
+        data["ota"]["password"]                     = ota.password;
 
-    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+        data["webadmin"]["active"]                  = webadmin.active;
+        data["webadmin"]["username"]                = webadmin.username;
+        data["webadmin"]["password"]                = webadmin.password;
 
-    data["other"]["rebootMode"]                 = rebootMode;
-    data["other"]["rebootModeTime"]             = rebootModeTime;
+        data["remoteManagement"]["managers"]        = remoteManagement.managers;
+        data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
 
-    data["other"]["rememberStationTime"]        = rememberStationTime;
+        data["ntp"]["server"]                       = ntp.server;
+        data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
 
-    data["other"]["backupDigiMode"]             = backupDigiMode;
+        data["other"]["rebootMode"]                 = rebootMode;
+        data["other"]["rebootModeTime"]             = rebootModeTime;
 
-    serializeJson(data, configFile);
+        data["other"]["rememberStationTime"]        = rememberStationTime;
 
-    configFile.close();
+        data["other"]["backupDigiMode"]             = backupDigiMode;
 
-    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 +188,24 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
 
+        if (!data["other"].containsKey("startupDelay")) needsRewrite = true;
+        startupDelay                    = data["other"]["startupDelay"] | 0;
+
+        if (!data["wifi"]["autoAP"].containsKey("password") ||
+            !data["wifi"]["autoAP"].containsKey("timeout")) needsRewrite = true;
         wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
         wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;
 
+        if (!data.containsKey("callsign")) needsRewrite = true;
         callsign                        = data["callsign"] | "NOCALL-10";
         
-
+        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";
@@ -187,7 +214,19 @@ bool Configuration::readFile() {
         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";
@@ -197,25 +236,37 @@ 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;
 
+        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") ||
+            !data["digi"].containsKey("beaconOnRxFreq")) needsRewrite = true;
         digi.mode                       = data["digi"]["mode"] | 0;
         digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
         if (digi.ecoMode == 1) shouldSleepStop = false;
+        digi.beaconOnRxFreq             = data["digi"]["beaconOnRxFreq"] | false;
 
         #if defined(HAS_A7670)
             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;
@@ -225,60 +276,103 @@ 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;
 
+        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") ||
+            !data["mqtt"].containsKey("beaconOverMqtt")) needsRewrite = true;
         mqtt.active                     = data["mqtt"]["active"] | false;
         mqtt.server                     = data["mqtt"]["server"] | "";
         mqtt.topic                      = data["mqtt"]["topic"] | "aprs-igate";
         mqtt.username                   = data["mqtt"]["username"] | "";
         mqtt.password                   = data["mqtt"]["password"] | "";
         mqtt.port                       = data["mqtt"]["port"] | 1883;
+        mqtt.beaconOverMqtt             = data["mqtt"]["beaconOverMqtt"] | false;
         
+        if (!data["ota"].containsKey("username") ||
+            !data["ota"].containsKey("password")) needsRewrite = true;
         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("server") ||
+            !data["ntp"].containsKey("gmtCorrection")) needsRewrite = true;
+        ntp.server                      = data["ntp"]["server"] | "pool.ntp.org";
         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
@@ -289,6 +383,13 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
         configFile.close();
+
+        if (needsRewrite) {
+            Serial.println("Config JSON incomplete, rewriting...");
+            writeFile();
+            delay(1000);
+            ESP.restart();
+        } 
         Serial.println("Config read successfuly");
         return true;
     } else {
@@ -297,7 +398,7 @@ bool Configuration::readFile() {
     }
 }
     
-void Configuration::init() {
+void Configuration::setDefaultValues() {
 
     WiFi_AP wifiap;
     wifiap.ssid                     = "";
@@ -305,6 +406,8 @@ void Configuration::init() {
 
     wifiAPs.push_back(wifiap);
 
+    startupDelay                    = 0;
+
     wifiAutoAP.password             = "1234567890";
     wifiAutoAP.timeout              = 10;
 
@@ -340,6 +443,7 @@ void Configuration::init() {
 
     digi.mode                       = 0;
     digi.ecoMode                    = 0;
+    digi.beaconOnRxFreq             = false;
 
     loramodule.txFreq               = 433775000;
     loramodule.rxFreq               = 433775000;
@@ -386,6 +490,7 @@ void Configuration::init() {
     mqtt.username                   = "";
     mqtt.password                   = "";
     mqtt.port                       = 1883;
+    mqtt.beaconOverMqtt             = false;
 
     ota.username                    = "";
     ota.password                    = "";
@@ -397,6 +502,7 @@ void Configuration::init() {
     remoteManagement.managers       = "";
     remoteManagement.rfOnly         = true;
 
+    ntp.server                      = "pool.ntp.org";
     ntp.gmtCorrection               = 0.0;
 
     rebootMode                      = false;
@@ -419,8 +525,9 @@ Configuration::Configuration() {
 
     bool exists = SPIFFS.exists("/igate_conf.json");
     if (!exists) {
-        init();
+        setDefaultValues();
         writeFile();
+        delay(1000);
         ESP.restart();
     }
 

src/lora_utils.cpp

@@ -30,6 +30,7 @@
 
 extern Configuration    Config;
 extern uint32_t         lastRxTime;
+extern bool             packetIsBeacon;
 
 extern std::vector<ReceivedPacket> receivedPackets;
 
@@ -143,7 +144,9 @@ namespace LoRa_Utils {
         if (!Config.loramodule.txActive) return;
 
         if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
-            changeFreqTx();
+            if (!packetIsBeacon || (packetIsBeacon && !Config.digi.beaconOnRxFreq)) {
+                changeFreqTx();
+            }
         }
         
         #ifdef INTERNAL_LED_PIN
@@ -165,7 +168,9 @@ namespace LoRa_Utils {
             if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, LOW);      // disabled in Ultra Eco Mode
         #endif
         if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
-            changeFreqRx();
+            if (!packetIsBeacon || (packetIsBeacon && !Config.digi.beaconOnRxFreq)) {
+                changeFreqRx();
+            }
         }
     }
 

src/ntp_utils.cpp

@@ -27,7 +27,7 @@
 extern      Configuration  Config;
 
 WiFiUDP     ntpUDP;
-NTPClient   timeClient(ntpUDP, "pool.ntp.org", 0, 15 * 60 * 1000);  // Update interval 15 min
+NTPClient   timeClient(ntpUDP, Config.ntp.server.c_str(), 0, 15 * 60 * 1000);  // Update interval 15 min
 
 
 namespace NTP_Utils {

src/power_utils.cpp

@@ -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_V1) || 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/station_utils.cpp

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

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

@@ -127,7 +127,7 @@ namespace Utils {
         seventhLine = "     listening...";
     }
 
-    void activeStations() {
+    void showActiveStations() {
         char buffer[30]; // Adjust size as needed
         sprintf(buffer, "Stations (%dmin) = %2d", Config.rememberStationTime, lastHeardStations.size());
         fourthLine = buffer;
@@ -159,7 +159,7 @@ namespace Utils {
 
             STATION_Utils::deleteNotHeard();
 
-            activeStations();
+            showActiveStations();
 
             beaconPacket            = iGateBeaconPacket;
             secondaryBeaconPacket   = iGateLoRaBeaconPacket;
@@ -259,7 +259,7 @@ namespace Utils {
                 Utils::println("-- Sending Beacon to RF --");
                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
                 seventhLine = "     listening...";
-                STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket);
+                STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket, true);
             }
 
             lastBeaconTx = millis();
@@ -436,4 +436,11 @@ namespace Utils {
         return true;
     }
 
+    void startupDelay() {
+        if (Config.startupDelay > 0) {
+            displayShow("", "  STARTUP DELAY ...", "", "", 0);
+            delay(Config.startupDelay * 60 * 1000);
+        }
+    }
+
 }

src/web_utils.cpp

@@ -115,159 +115,204 @@ 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.startupDelay                 = getParamIntSafe("startupDelay", Config.startupDelay);
 
+        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);
         if (Config.aprs_is.active) {
             Config.aprs_is.messagesToRF     = request->hasParam("aprs_is.messagesToRF", true);
             Config.aprs_is.objectsToRF      = request->hasParam("aprs_is.objectsToRF", true);
-            Config.aprs_is.server           = request->getParam("aprs_is.server", true)->value();
-            Config.aprs_is.passcode         = request->getParam("aprs_is.passcode", true)->value();
-            Config.aprs_is.port             = request->getParam("aprs_is.port", true)->value().toInt();
-            Config.aprs_is.filter           = request->getParam("aprs_is.filter", true)->value();  
+            Config.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);
         if (Config.beacon.statusActive) {
-            Config.beacon.statusPacket      = request->getParam("beacon.statusPacket", true)->value();
+            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                 = request->getParam("personalNote", true)->value();
+        Config.personalNote                 = getParamStringSafe("personalNote", Config.personalNote);
 
-        Config.blacklist                    = request->getParam("blacklist", true)->value();
+        Config.blacklist                    = getParamStringSafe("blacklist", Config.blacklist);
 
-        Config.digi.mode                    = request->getParam("digi.mode", true)->value().toInt();
-        Config.digi.ecoMode                 = request->getParam("digi.ecoMode", true)->value().toInt();;
+        Config.digi.mode                    = getParamIntSafe("digi.mode", Config.digi.mode);
+        Config.digi.ecoMode                 = getParamIntSafe("digi.ecoMode", Config.digi.ecoMode);
+        Config.digi.beaconOnRxFreq          = request->hasParam("digi.beaconOnRxFreq", true);
 
-        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);
         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.battery.sendInternalVoltage      = request->hasParam("battery.sendInternalVoltage", true);
-        Config.battery.monitorInternalVoltage   = request->hasParam("battery.monitorInternalVoltage", true);
+        Config.battery.sendInternalVoltage          = request->hasParam("battery.sendInternalVoltage", true);
+        Config.battery.monitorInternalVoltage       = request->hasParam("battery.monitorInternalVoltage", true);
         if (Config.battery.monitorInternalVoltage) {
-            Config.battery.internalSleepVoltage     = request->getParam("battery.internalSleepVoltage", true)->value().toFloat();
-        }        
+            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.monitorExternalVoltage       = request->hasParam("battery.monitorExternalVoltage", true);
         if (Config.battery.monitorExternalVoltage) {
-            Config.battery.externalSleepVoltage = request->getParam("battery.externalSleepVoltage", true)->value().toFloat();
+            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);
         if (Config.wxsensor.active) {
-            Config.wxsensor.heightCorrection        = request->getParam("wxsensor.heightCorrection", true)->value().toInt();
-            Config.wxsensor.temperatureCorrection   = request->getParam("wxsensor.temperatureCorrection", true)->value().toFloat();
+            Config.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.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);
+        Config.mqtt.active                  = request->hasParam("mqtt.active", true);
         if (Config.mqtt.active) {
-            Config.mqtt.server      = request->getParam("mqtt.server", true)->value();
-            Config.mqtt.topic       = request->getParam("mqtt.topic", true)->value();
-            Config.mqtt.username    = request->getParam("mqtt.username", true)->value();
-            Config.mqtt.password    = request->getParam("mqtt.password", true)->value();
-            Config.mqtt.port        = request->getParam("mqtt.port", true)->value().toInt();
+            Config.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.mqtt.beaconOverMqtt      = request->hasParam("mqtt.beaconOverMqtt", true);
         }
 
-        
-        Config.rebootMode           = request->hasParam("other.rebootMode", true);
+
+        Config.rebootMode                   = request->hasParam("other.rebootMode", true);
         if (Config.rebootMode) {
-            Config.rebootModeTime   = request->getParam("other.rebootModeTime", true)->value().toInt();
+            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.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.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.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();
+        Config.ntp.server                   = getParamStringSafe("ntp.server", Config.ntp.server);
+        Config.ntp.gmtCorrection            = getParamFloatSafe("ntp.gmtCorrection", Config.ntp.gmtCorrection);
 
-        Config.rememberStationTime          = request->getParam("other.rememberStationTime", true)->value().toInt();
+        Config.rememberStationTime          = getParamIntSafe("other.rememberStationTime", Config.rememberStationTime);
 
         Config.backupDigiMode               = request->hasParam("other.backupDigiMode", true);
+        
+        bool saveSuccess = Config.writeFile();
 
-        Config.writeFile();
-
-        AsyncWebServerResponse *response    = request->beginResponse(302, "text/html", "");
-        response->addHeader("Location", "/");
-        request->send(response);
-        displayToggle(false);
-        delay(200);
-        ESP.restart();
+        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_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