readme update

.github/workflows/build.yml

@@ -15,6 +15,8 @@ jobs:
                       chip: esp32
                     - name: ttgo-lora32-v21_915
                       chip: esp32
+                    - name: ttgo_lora32_t3s3_v1_2
+                      chip: esp32s3
                     - name: heltec-lora32-v2
                       chip: esp32
                     - name: heltec_wifi_lora_32_V3
@@ -73,6 +75,8 @@ jobs:
                       chip: esp32c3
                     - name: ESP32_C3_OctopusLab_LoRa
                       chip: esp32c3
+                    - name: QRPLabs_LightGateway_1_0
+                      chip: esp32s3
         steps:
             - uses: actions/checkout@v3
 

README.md

@@ -1,4 +1,4 @@
-# CA2RXU LoRa APRS iGate/Digirepeater
+# CA2RXU LoRa APRS iGate/Digipeater
 
 This firmware is for using ESP32 based boards with LoRa Modules and GPS to live in the APRS world.
 
@@ -32,11 +32,13 @@ ____________________________________________________
 
 (NOTE: all boards with 433-868-915 MHz versions)
 
-- TTGO Lilygo LoRa32 v2.1 / v1.6 (they work the same).
+- 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).
 
-- HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker.
+- HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker, Wireless Paper.
+
+- QRP Labs LightGateway 1.0.
 
 - ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
 
@@ -50,14 +52,19 @@ ____________________________________________________
 
 ## Timeline (Versions):
 
-- 2024.10.08 New EcoMode for Remote Digirepeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP and all was 150mA). APRS Message/Queries can start/stop this mode too.
-- 2024.10.06 Cross Frequency Digirepeater Rules added.
+- 2024.11.06 (Silent Update) Working now with Board "VARIANTS".
+- 2024.10.29 Added LILYGO Lora32 T3S3 support.
+- 2024.10.25 Added QRP Labs LightGateway 1.0 support.
+- 2024.10.21 Boards with GPS can now send Real-GPS Beacon (also posible: GPS ambiguity of ~ 1 km).
+- 2024.10.14 Received Packets in WebUI show real Local Time (NTP with GMT offset).
+- 2024.10.08 New EcoMode for Remote Digipeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP and all was 150mA). APRS Message/Queries can start/stop this mode too.
+- 2024.10.06 Cross Frequency Digipeater Rules added.
 - 2024.09.23 Libraries Update for SDK3
 - 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet. 
 - 2024.08.23 Wemos S2 Mini DIY LoRa added.
 - 2024.08.19 HELTEC Wireless Paper working (still missing Epaper code).
 - 2024.08.13 Web Authentication for WebUI. Thanks Mitja S57PNX.
-- 2024.08.05 WIDE2-n added to WIDE1-n in Digirepeater Modes.
+- 2024.08.05 WIDE2-n added to WIDE1-n in Digipeater Modes.
 - 2024.06.27 External Voltage Divider Resistor configuration on WebUI. Thanks Tilen S54B.
 - 2024.06.26 Personal Note information on WebUI for the Station. Thanks Tilen S54B.
 - 2024.06.24 Callsign Validation fix. Thanks Helge SA7SKY.
@@ -68,7 +75,7 @@ ____________________________________________________
 - 2024.06.08 Callsign Validation for all Station that iGate/Digi hears.
 - 2024.05.27 Battery Monitor for internal and External Voltages (to make board sleep and avoid low discharge of batterys) T-Beam boards now with Battery readings as well.
 - 2024.05.23 Forced Reboot Mode added.
-- 2024.05.22 Experimental backup-Digirepeater-Mode when "only" iGate mode loses WiFi connection added.
+- 2024.05.22 Experimental backup-Digipeater-Mode when "only" iGate mode loses WiFi connection added.
 - 2024.05.20 WebConfig update to control whether Messages and Objects should be Tx to RF.
 - 2024.05.17 HELTEC Wireless Stick Lite v3 support added.
 - 2024.05.14 BME modules will be autodetected (I2C Address and if it is BME280/BMP280/BME680).
@@ -80,12 +87,12 @@ ____________________________________________________
 - 2024.04.21 WEB INSTALLER (thanks Damian SQ2CPA).
 - 2024.04.20 New Output Buffer process: no more packets lost.
 - 2024.04.13 Received Packets added on WebUI.
-- 2024.04.09 iGate/Digirepeater own GPS beacon is encoded (Base91) now.
+- 2024.04.09 iGate/Digipeater own GPS beacon is encoded (Base91) now.
 - 2024.03.18 OE5HWN MeshCom board support added.
 - 2024.02.25 New Web Configuration UI with WiFi AP (thanks Damian SQ2CPA).
 - 2023.01.28 Updated to ElegantOTA v.3 (AsyncElegantOTA was deprecated).
 - 2024.01.19 TextSerialOutputForApp added to get text from Serial-Output over USB into PC for PinPoint App (https://www.pinpointaprs.com) and APRSIS32 App (http://aprsisce.wikidot.com)
-- 2024.01.12 Added iGate Mode to also repeat packets (like a iGate+DigiRepeater) in stationMode 2 and 5.
+- 2024.01.12 Added iGate Mode to also repeat packets (like a iGate+Digipeater) in stationMode 2 and 5.
 - 2024.01.11 Added iGate Mode to enable APRS-IS and LoRa beacon report at the same time.
 - 2024.01.05 Lilygo TTGO T-Beam V1, V1.2, V1 + SX1268, V1.2 + SX1262 support added.
 - 2024.01.02 EByte 400M30S 1 Watt LoRa module for DIY ESP32 iGate support added.
@@ -94,18 +101,18 @@ ____________________________________________________
 - 2023.12.07 MIC-E process and Syslog added.
 - 2023.12.06 HELTEC V2 board support added.
 - 2023.11.26 Small correction to enable Syslog in stationMode5.
-- 2023.10.09 Added "WIDE1-1" to Tx packets from iGate to be *repeated* by Digirepeaters.
+- 2023.10.09 Added "WIDE1-1" to Tx packets from iGate to be *repeated* by Digipeaters.
 - 2023.10.09 BMP280 module support added.
 - 2023.08.20 Added External Voltage Measurement (Max 15V!)
 - 2023.08.05 Ground Height Correction for Pressure readings added.
-- 2023.07.31 StationMode5 added: iGate when WiFi and APRS available, DigiRepeater when not.
+- 2023.07.31 StationMode5 added: iGate when WiFi and APRS available, Digipeater when not.
 - 2023.07.16 Small OTA, BME module update.
 - 2023.07.05 Adding monitor info of Battery connected.
 - 2023.06.18 Info on Oled Screen mayor update, added RSSI and Distance to Listened Station.
 - 2023.06.17 BME280 Module (Temperature, Humidity, Pressure) support added.
 - 2023.06.12 Syslog added.
 - 2023.06.10 OTA update support for Firmware and Filesystem.
-- 2023.06.08 Adding Digirepeater Functions.
+- 2023.06.08 Adding Digipeater Functions.
 - 2023.06.06 Full repack of Code and adding _enableTx_ only for Ham Ops.
 - 2023.05.23 Processing Query's from RF/LoRa or APRS-IS (Send "Help" Message to test).
 - 2023.05.19 Saving Last-Heard Stations for validating Tx Responses.
@@ -116,4 +123,4 @@ ____________________________________________________
 
 __________________________________________
 
-# Hope You Enjoy this, 73 !!  CA2RXU , Valparaiso, Chile
+# Hope You Enjoy this, 73! CA2RXU, Valparaiso, Chile

common_settings.ini

@@ -0,0 +1,44 @@
+[common]
+build_flags =
+	-Werror -Wall
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+	-DRADIOLIB_EXCLUDE_CC1101=1
+	-DRADIOLIB_EXCLUDE_NRF24=1
+	-DRADIOLIB_EXCLUDE_RF69=1
+	-DRADIOLIB_EXCLUDE_SX1231=1
+	-DRADIOLIB_EXCLUDE_SX1233=1
+	-DRADIOLIB_EXCLUDE_SI443X=1
+	-DRADIOLIB_EXCLUDE_RFM2X=1
+	-DRADIOLIB_EXCLUDE_AFSK=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
+	-DRADIOLIB_EXCLUDE_MORSE=1
+	-DRADIOLIB_EXCLUDE_RTTY=1
+	-DRADIOLIB_EXCLUDE_SSTV=1
+	-DRADIOLIB_EXCLUDE_AX25=1
+	-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_PAGER=1
+	-DRADIOLIB_EXCLUDE_FSK4=1
+	-DRADIOLIB_EXCLUDE_APRS=1
+	-DRADIOLIB_EXCLUDE_LORAWAN=1
+	-I variants/${PIOENV}
+lib_deps =
+	adafruit/Adafruit Unified Sensor @ 1.1.14
+	adafruit/Adafruit BME280 Library @ 2.2.4
+	adafruit/Adafruit BMP280 Library @ 2.6.8
+	adafruit/Adafruit BME680 Library @ 2.0.4
+	adafruit/Adafruit Si7021 Library @ 1.5.3
+	arduino-libraries/NTPClient @ 3.2.1
+	ayushsharma82/ElegantOTA @ 3.1.5
+	bblanchon/ArduinoJson @ 6.21.3
+	jgromes/RadioLib @ 6.6.0
+	mathieucarbou/AsyncTCP @ 3.2.5
+	mathieucarbou/ESPAsyncWebServer @ 3.2.3
+	mikalhart/TinyGPSPlus @ 1.0.3	
+display_libs =
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+usb_flags=
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1 

data/igate_conf.json

@@ -81,6 +81,9 @@
         "username": "admin",
         "password": ""
     },
+    "ntp": {
+        "gmtCorrection": 0
+    },
     "other": {
         "rememberStationTime": 30,
         "lowPowerMode": false,

data_embed/index.html

@@ -62,11 +62,11 @@
             <div class="container d-none" id="received-packets">
                 <div class="row my-5 d-flex align-items-top">
                     <div class="col-12">
-                        <h3>Last 20 received packets list</h3>
+                        <h3>Last 10 received packets list</h3>
                         <table class="table mt-4">
                             <thead>
                                 <tr>
-                                    <th scope="col">Time*</th>
+                                    <th scope="col">Time</th>
                                     <th scope="col">Frame</th>
                                     <th scope="col">RSSI</th>
                                     <th scope="col">SNR</th>
@@ -77,7 +77,7 @@
                             </tbody>
                         </table>
                         <span>List refresh automatically every 15 seconds.</span><br>
-                        <small>* - For now time is measured from board boot up.</small>
+                        <small>(Local Time is NPT-Time adjusted with your GMT Offset)</small>
                     </div>
                 </div>
                 <hr />
@@ -121,7 +121,7 @@
                                 <div class="row">
                                     <div class="col-12">
                                         <label for="callsign" class="form-label"
-                                            >Callsign and SSID</label
+                                            >Callsign - SSID</label
                                         >
                                         <input
                                             type="text"
@@ -152,7 +152,7 @@
                                         <label
                                             for="beacon.path"
                                             class="form-label"
-                                            >Beacon path</label
+                                            >Beacon Path</label
                                         >
                                         <input
                                             type="text"
@@ -492,8 +492,7 @@
                                             <label
                                                 for="beacon.sendViaAPRSIS"
                                                 class="form-label"
-                                                >Send our beacon to
-                                                APRS-IS
+                                                >Send beacon via APRS-IS
                                             </label>
                                         </div>
                                     </div>
@@ -516,12 +515,12 @@
                                         <button class="btn btn-primary" id="send-beacon">Send beacon now</button>
                                     </div>
                                 </div>
-                                <div class="row mt-3">
+                                <div class="row mt-4">
                                     <div class="col-12">
                                         <label
                                             for="beacon.interval"
                                             class="form-label"
-                                            >Interval
+                                            >Beacon Interval
                                         </label>
                                         <div class="input-group">
                                             <input
@@ -532,7 +531,7 @@
                                                 class="form-control"
                                                 required=""
                                                 step="1"
-                                                min="1"
+                                                min="15"
                                             />
                                             <span class="input-group-text"
                                                 >minutes
@@ -540,6 +539,36 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="col-12 mt-3">
+                                    <div class="form-check form-switch">
+                                        <input
+                                            type="checkbox"
+                                            name="beacon.gpsActive"
+                                            id="beacon.gpsActive"
+                                            class="form-check-input"
+                                        />
+                                        <label
+                                            for="beacon.gpsActive"
+                                            class="form-label"
+                                            >Send Real-GPS Beacon <small>(Only for Boards with GPS Modules)</small>
+                                        </label>
+                                    </div>
+                                </div>
+                                <div class="col-12">
+                                    <div class="form-check form-switch">
+                                        <input
+                                            type="checkbox"
+                                            name="beacon.gpsAmbiguity"
+                                            id="beacon.gpsAmbiguity"
+                                            class="form-check-input"
+                                        />
+                                        <label
+                                            for="beacon.gpsAmbiguity"
+                                            class="form-label"
+                                            >Send Real-GPS Beacon with Ambiguity <small>(~ 1 Km of Random Error)</small>
+                                        </label>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <hr />
@@ -596,7 +625,7 @@
                                             <label
                                                 for="digi.ecoMode"
                                                 class="form-label"
-                                                >Eco Mode<small> This will disable WiFi, Display, Leds and lower CPU Speed for Low Power Digirepeater. (<strong>Caution:</strong> Active means No WebUI Configuration, so <strong>ONLY</strong> activate this for Remote Digirepeater)</small></label
+                                                >Eco Mode<small> This will disable WiFi, Display, Leds and lower CPU Speed for Low Power Digipeater. (<strong>Caution:</strong> Active means No WebUI Configuration, so <strong>ONLY</strong> activate this for Remote Digipeater)</small></label
                                             >
                                         </div>
                                     </div>
@@ -806,7 +835,6 @@
                                             id="lora.codingRate4"
                                             required=""
                                         >
-                                            <option value="4">4</option>
                                             <option value="5">5</option>
                                             <option value="6">6</option>
                                             <option value="7">7</option>
@@ -1169,7 +1197,7 @@
                                                 class="form-label"
                                                 ><b>Activate Wx Telemetry</b>
                                                 <small
-                                                    >Requires a BME/BMP280, BME680 or Si7021 sensor installed</small
+                                                    >Requires a BME/BMP280, BME680 or Si7021 sensor.</small
                                                 ></label
                                             >
                                         </div>
@@ -1267,7 +1295,7 @@
                                             type="text"
                                             name="syslog.server"
                                             id="syslog.server"
-                                            placeholder="192.168.0.100"
+                                            placeholder="lora.link9.net"
                                             class="form-control"
                                             disabled
                                         />
@@ -1639,6 +1667,55 @@
                         </div>
                         <hr />
 
+                        <div class="row my-5 d-flex align-items-top">
+                            <div class="col-lg-3 col-sm-12">
+                                <h5>
+                                    <svg
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        width="20"
+                                        height="20"
+                                        fill="currentColor"
+                                        class="bi bi-cloud-upload-fill"
+                                        viewBox="0 0 16 16"
+                                    >
+                                        <path
+                                            fill-rule="evenodd"
+                                            d="M8 0a5.53 5.53 0 0 0-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 4.095 0 5.555 0 7.318 0 9.366 1.708 11 3.781 11H7.5V5.707L5.354 7.854a.5.5 0 1 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 5.707V11h4.188C14.502 11 16 9.57 16 7.773c0-1.636-1.242-2.969-2.834-3.194C12.923 1.999 10.69 0 8 0m-.5 14.5V11h1v3.5a.5.5 0 0 1-1 0"
+                                        />
+                                    </svg>
+                                    NTP
+                                </h5>
+                                <small
+                                    >Set your GMT Time Zone.
+                                </small>
+                            </div>
+                            <div class="col-lg-9 col-sm-12">
+                                <div class="col-12">
+                                    <label
+                                        for="ntp.gmtCorrection"
+                                        class="form-label"
+                                        >GMT Time Correction for accurate Local Time</label
+                                    >
+                                    <div class="input-group">
+                                        <input
+                                            type="number"
+                                            name="ntp.gmtCorrection"
+                                            id="ntp.gmtCorrection"
+                                            placeholder="0"
+                                            class="form-control"
+                                            step="1"
+                                            min="-23"
+                                            max="23"
+                                        />
+                                        <span class="input-group-text"
+                                            >hours</span
+                                        >
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr />
+
                         <div class="row my-5 d-flex align-items-top">
                             <div class="col-lg-3 col-sm-12">
                                 <h5>
@@ -1666,7 +1743,7 @@
                                     <div class="col-12">
                                         <div class="form-check form-switch">
                                             <div class="form-text">
-                                                When "only" iGate Mode loses WiFi, it will change into a Digirepeater Mode and after 15 min check if WiFi available and return to "only" iGate Mode.
+                                                When "only" iGate Mode loses WiFi, it will change into a Digipeater Mode and after 15 min check if WiFi available and return to "only" iGate Mode.
                                             </div>
                                             <input
                                                 type="checkbox"
@@ -1677,7 +1754,7 @@
                                             <label
                                                 for="other.backupDigiMode"
                                                 class="form-label"
-                                                >Backup Digirepeater Mode</label
+                                                >Backup Digipeater Mode</label
                                             >
                                         </div>
                                     </div>

data_embed/script.js

@@ -134,6 +134,9 @@ function loadSettings(settings) {
     document.getElementById("beacon.sendViaAPRSIS").checked             = settings.beacon.sendViaAPRSIS;
     document.getElementById("beacon.sendViaRF").checked                 = settings.beacon.sendViaRF;
 
+    document.getElementById("beacon.gpsActive").checked                 = settings.beacon.gpsActive;
+    document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;
+
     // Digi
     document.getElementById("digi.mode").value                          = settings.digi.mode;
     document.getElementById("digi.ecoMode").checked                     = settings.digi.ecoMode;
@@ -208,6 +211,9 @@ function loadSettings(settings) {
     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;
+
     // Experimental
     document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
 
@@ -245,8 +251,6 @@ document.getElementById('reboot').addEventListener('click', function (e) {
 
 const wxsensorCheckbox = document.querySelector("input[name='wxsensor.active']");
 
-const stationModeSelect = document.querySelector("select[name='stationMode']");
-
 function updateImage() {
     const value = document.getElementById("beacon.overlay").value + document.getElementById("beacon.symbol").value;
 
@@ -507,13 +511,9 @@ function loadReceivedPackets(packets) {
 
         packets.forEach((packet) => {
             const element = document.createElement("tr");
-
-            date.setTime(packet.millis);
-
-            const p = date.toUTCString().split(' ')
         
             element.innerHTML = `
-                        <td>${p[p.length-2]}</td>
+                        <td>${packet.rxTime}</td>
                         <td>${packet.packet}</td>
                         <td>${packet.RSSI}</td>
                         <td>${packet.SNR}</td>

platformio.ini

@@ -11,6 +11,10 @@
 [platformio]
 default_envs = ttgo-lora32-v21
 
+extra_configs =
+	common_settings.ini
+  	variants/*/platformio.ini
+
 [env]
 platform = espressif32 @ 6.7.0
 board_build.partitions = min_spiffs.csv
@@ -25,456 +29,4 @@ board_build.embed_files =
 	data_embed/favicon.png.gz
 extra_scripts = 
 	pre:tools/compress.py
-debug_tool = esp-prog
-
-[common]
-lib_deps = 
-	jgromes/RadioLib @ 6.6.0
-	mikalhart/TinyGPSPlus @ 1.0.3
-	bblanchon/ArduinoJson @ 6.21.3
-	adafruit/Adafruit Unified Sensor @ 1.1.14
-	adafruit/Adafruit BME280 Library @ 2.2.4
-	adafruit/Adafruit BMP280 Library @ 2.6.8
-	adafruit/Adafruit BME680 Library @ 2.0.4
-	adafruit/Adafruit Si7021 Library @ 1.5.3
-	ayushsharma82/ElegantOTA @ 3.1.5
-	mathieucarbou/ESPAsyncWebServer @ 3.2.3
-	mathieucarbou/AsyncTCP @ 3.2.5
-
-[env:ttgo-lora32-v21]
-board = ttgo-lora32-v21
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_LORA32_V2_1
-	-DHAS_SX1278
-	-DHAS_ADC_CALIBRATION
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ttgo-lora32-v21_915]
-board = ttgo-lora32-v21
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_LORA32_V2_1_915
-	-DHAS_SX1276
-	-DHAS_ADC_CALIBRATION
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:heltec-lora32-v2]
-board = ttgo-lora32-v21
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_V2
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:heltec_wifi_lora_32_V3]
-board = heltec_wifi_lora_32_V3
-board_build.mcu = esp32s3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_V3
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:heltec_wireless_stick]
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_WS
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:heltec_wireless_stick_lite_v3]
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_WSL_V3
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-
-[env:heltec_wireless_stick_lite_v3_display]
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_WSL_V3_DISPLAY
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-
-[env:ESP32_DIY_LoRa]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_LoRa
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_DIY_LoRa_915]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_LoRa_915
-	-DHAS_SX1276
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_DIY_1W_LoRa]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_1W_LoRa
-	-DHAS_SX1268
-	-DHAS_1W_LORA
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_DIY_1W_LoRa_915]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_1W_LoRa_915
-	-DHAS_SX1262
-	-DHAS_1W_LORA
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_DIY_1W_LoRa_LLCC68]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
- 	-DESP32_DIY_1W_LoRa_LLCC68
- 	-DHAS_LLCC68
- 	-DHAS_1W_LORA
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
- 	${common.lib_deps}
- 	adafruit/Adafruit GFX Library @ 1.11.9
- 	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_DIY_1W_LoRa_Mesh_V1_2]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_1W_LoRa_Mesh_V1_2
-	-DHAS_SX1268
-	-DHAS_1W_LORA
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-
-[env:ttgo-t-beam-v1_2]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_2
-	-DHAS_SX1278
-	-DHAS_AXP2101
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1_2_915]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_2_915
-	-DHAS_SX1276
-	-DHAS_AXP2101
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_0
-	-DHAS_SX1278
-	-DHAS_AXP192
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1_915]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_0_915
-	-DHAS_SX1276
-	-DHAS_AXP192
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1_SX1268]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_0_SX1268
-	-DHAS_SX1268
-	-DHAS_AXP192
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1_2_SX1262]
-board = ttgo-t-beam
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_Beam_V1_2_SX1262
-	-DHAS_SX1262
-	-DHAS_AXP2101
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ESP32_DIY_LoRa_A7670]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_LoRa_A7670
-	-DHAS_SX1278
-	-DHAS_A7670
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	vshymanskyy/TinyGSM @ 0.12.0
-	vshymanskyy/StreamDebugger @ 1.0.1
-
-[env:ESP32_DIY_LoRa_A7670_915]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DESP32_DIY_LoRa_A7670_915
-	-DHAS_SX1276
-	-DHAS_A7670
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-	vshymanskyy/TinyGSM @ 0.12.0
-	vshymanskyy/StreamDebugger @ 1.0.1
-
-
-[env:heltec_wireless_tracker]
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_WIRELESS_TRACKER
-	-DHAS_SX1262
-	-DHAS_TFT
-	-D USER_SETUP_LOADED
-	-D TFT_WIDTH=80
-	-D TFT_HEIGHT=160
-	-D ST7735_DRIVER
-	-D ST7735_GREENTAB160x80
-	-D TFT_RGB_ORDER=TFT_BGR
-	-D TFT_MOSI=42
-	-D TFT_SCLK=41
-	-D TFT_CS=38
-	-D TFT_DC=40
-	-D TFT_RST=39
-	-D TFT_BL=21
-	-D TFT_BACKLIGHT_ON=1
-	-D TOUCH_CS=-1
-	-D LOAD_GLCD
-	-D LOAD_FONT2
-	-D LOAD_FONT4
-	-D LOAD_FONT6
-	-D LOAD_FONT7
-	-D LOAD_FONT8
-	-D SPI_FREQUENCY=27000000
-	-D USE_HSPI_PORT
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	bodmer/TFT_eSPI @ 2.5.43
-
-[env:heltec_ht-ct62]
-board = heltec_wireless_stick_lite
-board_build.mcu = esp32c3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_HTCT62
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:heltec_wireless_paper]
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags =
-	-Werror -Wall
-	-DHELTEC_WP
-	-DHAS_SX1262
-	-DHAS_EPAPER
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-
-
-[env:OE5HWN_MeshCom]
-board = esp32dev
-build_flags = 
-	-Werror -Wall
-	-DOE5HWN_MeshCom
-	-DHAS_SX1268
-	-DHAS_1W_LORA
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:WEMOS-LOLIN32-OLED-DIY]
-board = lolin32
-build_flags = 
-	-Werror -Wall
-	-DWEMOS_LOLIN32_OLED_DIY_LoRa
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:WEMOS-D1-R32-RA02]
-board = wemos_d1_uno32
-build_flags = 
-	-Werror -Wall
-	-DWEMOS_D1_R32_RA02
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:WEMOS_S2_MINI_DIY_LoRa]
-board = lolin_s2_mini
-build_flags = 
-	-Werror -Wall
-	-DWEMOS_S2_MINI_DIY_LoRa
-	-DHAS_SX1278
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:esp32c3_DIY_1W_LoRa]
-board = esp32-c3-devkitm-1
-board_build.mcu = esp32c3
-build_flags =
-	-Werror -Wall
-	-DESP32C3_DIY_1W_LoRa
-	-DHAS_SX1268
-	-DHAS_1W_LORA
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:esp32c3_DIY_1W_LoRa_915]
-board = esp32-c3-devkitm-1
-board_build.mcu = esp32c3
-build_flags =
-	-Werror -Wall
-	-DESP32C3_DIY_1W_LoRa_915
-	-DHAS_SX1262
-	-DHAS_1W_LORA
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
-[env:ESP32_C3_OctopusLab_LoRa]
-board = esp32-c3-devkitm-1
-board_build.mcu = esp32c3
-build_flags =
-	-Werror -Wall
-	-DESP32_C3_OctopusLab_LoRa
-	-DHAS_SX1268
-	-DRADIO_HAS_XTAL
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps =
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
+debug_tool = esp-prog

src/A7670_utils.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 #include "aprs_is_utils.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "A7670_utils.h"
 #include "lora_utils.h"
 #include "display.h"
@@ -200,6 +200,6 @@
                 }
             }
             delay(1);
-        } 
+        }
     }
 #endif

src/A7670_utils.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 
+
 namespace A7670_Utils {
 
     bool checkModemOn();

src/LoRa_APRS_iGate.cpp

@@ -1,18 +1,27 @@
-/*______________________________________________________________________________________________________________
+/*___________________________________________________________________
 
-██╗      ██████╗ ██████╗  █████╗      █████╗ ██████╗ ██████╗ ███████╗    ██╗ ██████╗  █████╗ ████████╗███████╗
-██║     ██╔═══██╗██╔══██╗██╔══██╗    ██╔══██╗██╔══██╗██╔══██╗██╔════╝    ██║██╔════╝ ██╔══██╗╚══██╔══╝██╔════╝
-██║     ██║   ██║██████╔╝███████║    ███████║██████╔╝██████╔╝███████╗    ██║██║  ███╗███████║   ██║   █████╗  
-██║     ██║   ██║██╔══██╗██╔══██║    ██╔══██║██╔═══╝ ██╔══██╗╚════██║    ██║██║   ██║██╔══██║   ██║   ██╔══╝  
-███████╗╚██████╔╝██║  ██║██║  ██║    ██║  ██║██║     ██║  ██║███████║    ██║╚██████╔╝██║  ██║   ██║   ███████╗
-╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝    ╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚══════╝    ╚═╝ ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚══════╝
+██╗      ██████╗ ██████╗  █████╗      █████╗ ██████╗ ██████╗ ███████╗
+██║     ██╔═══██╗██╔══██╗██╔══██╗    ██╔══██╗██╔══██╗██╔══██╗██╔════╝
+██║     ██║   ██║██████╔╝███████║    ███████║██████╔╝██████╔╝███████╗
+██║     ██║   ██║██╔══██╗██╔══██║    ██╔══██║██╔═══╝ ██╔══██╗╚════██║
+███████╗╚██████╔╝██║  ██║██║  ██║    ██║  ██║██║     ██║  ██║███████║
+╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝    ╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚══════╝
+                                                                     
+                ██╗ ██████╗  █████╗ ████████╗███████╗
+                ██║██╔════╝ ██╔══██╗╚══██╔══╝██╔════╝
+                ██║██║  ███╗███████║   ██║   █████╗
+                ██║██║   ██║██╔══██║   ██║   ██╔══╝
+                ██║╚██████╔╝██║  ██║   ██║   ███████╗
+                ╚═╝ ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚══════╝
 
-                                          Ricardo Guzman - CA2RXU 
-                              https://github.com/richonguzman/LoRa_APRS_Tracker
-                                 (donations : http://paypal.me/richonguzman)
-______________________________________________________________________________________________________________*/
+
+                       Ricardo Guzman - CA2RXU 
+          https://github.com/richonguzman/LoRa_APRS_Tracker
+             (donations : http://paypal.me/richonguzman)
+___________________________________________________________________*/
 
 #include <ElegantOTA.h>
+#include <TinyGPS++.h>
 #include <Arduino.h>
 #include <WiFi.h>
 #include <vector>
@@ -20,8 +29,8 @@ ________________________________________________________________________________
 #include "battery_utils.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
-#include "boards_pinout.h"
 #include "battery_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
 #include "query_utils.h"
 #include "power_utils.h"
@@ -31,6 +40,7 @@ ________________________________________________________________________________
 #include "gps_utils.h"
 #include "web_utils.h"
 #include "tnc_utils.h"
+#include "ntp_utils.h"
 #include "wx_utils.h"
 #include "display.h"
 #include "utils.h"
@@ -38,19 +48,23 @@ ________________________________________________________________________________
     #include "A7670_utils.h"
 #endif
 
-String          versionDate             = "2024.10.08";
-Configuration   Config;
-WiFiClient      espClient;
+String              versionDate             = "2024.11.06";
+Configuration       Config;
+WiFiClient          espClient;
+#ifdef HAS_GPS
+    HardwareSerial  gpsSerial(1);
+    TinyGPSPlus     gps;
+#endif
 
-uint8_t         myWiFiAPIndex           = 0;
-int             myWiFiAPSize            = Config.wifiAPs.size();
-WiFi_AP         *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
+uint8_t             myWiFiAPIndex           = 0;
+int                 myWiFiAPSize            = Config.wifiAPs.size();
+WiFi_AP             *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
 
-bool            isUpdatingOTA           = false;
-uint32_t        lastBatteryCheck        = 0;
+bool                isUpdatingOTA           = false;
+uint32_t            lastBatteryCheck        = 0;
 
-bool            backUpDigiMode          = false;
-bool            modemLoggedToAPRSIS     = false;
+bool                backUpDigiMode          = false;
+bool                modemLoggedToAPRSIS     = false;
 
 std::vector<ReceivedPacket> receivedPackets;
 
@@ -64,11 +78,11 @@ void setup() {
     Utils::setupDisplay();
     LoRa_Utils::setup();
     Utils::validateFreqs();
-    GPS_Utils::generateBeacons();
+    GPS_Utils::setup();
 
     #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
-    displayShow("", "  STARTUP DELAY ...", "", "", 0);
-    delay(STARTUP_DELAY * 60 * 1000);
+        displayShow("", "  STARTUP DELAY ...", "", "", 0);
+        delay(STARTUP_DELAY * 60 * 1000);
     #endif
 
     #ifdef HELTEC_HTCT62
@@ -113,6 +127,7 @@ void setup() {
     #endif
     DIGI_Utils::checkEcoMode();
     WIFI_Utils::setup();
+    NTP_Utils::setup();
     SYSLOG_Utils::setup();
     WX_Utils::setup();
     WEB_Utils::setup();
@@ -145,6 +160,7 @@ void loop() {
         if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
     #endif
 
+    NTP_Utils::update();
     TNC_Utils::loop();
 
     Utils::checkDisplayInterval();
@@ -164,7 +180,7 @@ void loop() {
 
         if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode)) { // If Digi enabled
             STATION_Utils::clean25SegBuffer();
-            DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi            
+            DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
         }
 
         if (Config.tnc.enableServer) { // If TNC server enabled

src/aprs_is_utils.cpp

@@ -101,7 +101,7 @@ namespace APRS_IS_Utils {
             if(aprsisState == "--" && !Config.display.alwaysOn && Config.display.timeout != 0) {
                 displayToggle(true);
                 lastScreenOn = millis();
-            }            
+            }
         }
         secondLine = "WiFi: ";
         secondLine += wifiState;
@@ -176,7 +176,7 @@ namespace APRS_IS_Utils {
     void processLoRaPacket(const String& packet) {
         if (espClient.connected() || modemLoggedToAPRSIS) {
             if (packet != "") {
-                if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {                    
+                if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
                     int firstColonIndex = packet.indexOf(":");
                     if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
                         const String& Sender = packet.substring(3, packet.indexOf(">"));
@@ -207,7 +207,7 @@ namespace APRS_IS_Utils {
                                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                             }
                         }
-                    }                    
+                    }
                 }
             }
         }
@@ -285,7 +285,7 @@ namespace APRS_IS_Utils {
                             A7670_Utils::uploadToAPRSIS(ackPacket);
                         #else
                             upload(ackPacket);
-                        #endif                        
+                        #endif
                         receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
                     } else {
                         receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);

src/battery_utils.cpp

@@ -1,7 +1,7 @@
 #include <Arduino.h>
 #include "battery_utils.h"
 #include "configuration.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "power_utils.h"
 #include "utils.h"
 
@@ -23,7 +23,7 @@ int     telemetryCounter                = random(1,999);
 #ifdef HAS_ADC_CALIBRATION
     #include <esp_adc_cal.h>
 
-    #if defined(TTGO_T_LORA32_V2_1) || defined(TTGO_T_LORA32_V2_1_915)
+    #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915)
         #define InternalBattery_ADC_Channel ADC1_CHANNEL_7  // t_lora32 pin35
         #define ExternalVoltage_ADC_Channel ADC1_CHANNEL_6  // t_lora32 pin34
     #endif
@@ -126,7 +126,7 @@ namespace BATTERY_Utils {
                             sample = 0;
                         #endif
                     #endif
-                #endif                
+                #endif
                 sampleSum += sample;
                 delayMicroseconds(50); 
             }
@@ -182,7 +182,7 @@ namespace BATTERY_Utils {
 
         float extVoltage;
         #ifdef HAS_ADC_CALIBRATION
-            if (calibrationEnable){       
+            if (calibrationEnable){
                 extVoltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars) * voltageDividerTransformation; // in mV
                 extVoltage /= 1000;
             } else {
@@ -240,7 +240,7 @@ namespace BATTERY_Utils {
                     tempValue = value;
                     break;
             }
-        }        
+        }
 
         int firstByte   = tempValue / 91;
         tempValue       -= firstByte * 91;

src/boards_pinout.h

@@ -1,274 +0,0 @@
-#ifndef PINS_CONFIG_H_
-#define PINS_CONFIG_H_
-
-#include <Arduino.h>
-
-#undef OLED_SDA
-#undef OLED_SCL
-#undef OLED_RST
-
-
-// LORA MODULES
-#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0_915)
-    #define RADIO_SCLK_PIN  5       // GPIO5    - SX1278 SCK
-    #define RADIO_MISO_PIN  19      // GPIO19   - SX1278 MISO
-    #define RADIO_MOSI_PIN  27      // GPIO27   - SX1278 MOSI
-    #define RADIO_CS_PIN    18      // GPIO18   - SX1278 CS ---> NSS
-    #define RADIO_RST_PIN   14      // GPIO14   - SX1278 RST
-    #define RADIO_BUSY_PIN  26      // GPIO26   - SX1278 IRQ ---->DIO0
-#endif
-
-#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) || defined(HELTEC_WP)
-    #define RADIO_SCLK_PIN  9       // SX1262 SCK
-    #define RADIO_MISO_PIN  11      // SX1262 MISO
-    #define RADIO_MOSI_PIN  10      // SX1262 MOSI
-    #define RADIO_CS_PIN    8       // SX1262 NSS
-    #define RADIO_RST_PIN   12      // SX1262 RST
-    #define RADIO_DIO1_PIN  14      // SX1262 DIO1
-    #define RADIO_BUSY_PIN  13      // SX1262 BUSY
-#endif
-
-#if defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68)   // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262) or E220 LLCC68
-    #define RADIO_SCLK_PIN  18
-    #define RADIO_MISO_PIN  19
-    #define RADIO_MOSI_PIN  23
-    #define RADIO_CS_PIN    5
-    #define RADIO_RST_PIN   27
-    #define RADIO_DIO1_PIN  12
-    #define RADIO_BUSY_PIN  14
-    #define RADIO_RXEN      32
-    #define RADIO_TXEN      25
-#endif
-
-#if defined(ESP32_DIY_1W_LoRa_Mesh_V1_2)  // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins
-    #define RADIO_SCLK_PIN  5
-    #define RADIO_MISO_PIN  19
-    #define RADIO_MOSI_PIN  27
-    #define RADIO_CS_PIN    18
-    #define RADIO_RST_PIN   23
-    #define RADIO_DIO1_PIN  33
-    #define RADIO_BUSY_PIN  32
-    #define RADIO_RXEN      14
-    #define RADIO_TXEN      13
-#endif
-
-#ifdef WEMOS_LOLIN32_OLED_DIY_LoRa
-    #define RADIO_SCLK_PIN  15
-    #define RADIO_MISO_PIN  13
-    #define RADIO_MOSI_PIN  12
-    #define RADIO_CS_PIN    14
-    #define RADIO_RST_PIN   2
-    #define RADIO_BUSY_PIN  25
-#endif
-
-#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
-    #define RADIO_SCLK_PIN  5
-    #define RADIO_MISO_PIN  19
-    #define RADIO_MOSI_PIN  27
-    #define RADIO_CS_PIN    18
-    #define RADIO_DIO0_PIN  26
-    #define RADIO_RST_PIN   23
-    #define RADIO_DIO1_PIN  33
-    #define RADIO_BUSY_PIN  32
-#endif
-
-#if defined(OE5HWN_MeshCom)
-    #define RADIO_SCLK_PIN      18
-    #define RADIO_MISO_PIN      19
-    #define RADIO_MOSI_PIN      23
-    #define RADIO_CS_PIN        5
-    #define RADIO_RST_PIN       27
-    #define RADIO_DIO1_PIN      33
-    #define RADIO_BUSY_PIN      26
-    #define RADIO_RXEN          14
-    #define RADIO_TXEN          13
-#endif
-
-#if defined(HELTEC_HTCT62)
-    #define RADIO_SCLK_PIN  10   // SX1262 SCK
-    #define RADIO_MISO_PIN  6    // SX1262 MISO
-    #define RADIO_MOSI_PIN  7    // SX1262 MOSI
-    #define RADIO_CS_PIN    8    // SX1262 NSS
-    #define RADIO_RST_PIN   5    // SX1262 RST
-    #define RADIO_DIO1_PIN  3    // SX1262 DIO1
-    #define RADIO_BUSY_PIN  4    // SX1262 BUSY
-#endif
-
-#if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
-    #define RADIO_SCLK_PIN  18
-    #define RADIO_MISO_PIN  19
-    #define RADIO_MOSI_PIN  23
-    #define RADIO_CS_PIN    2
-    #define RADIO_RST_PIN   0
-    #define RADIO_BUSY_PIN  32
-    #define A7670_PWR_PIN   4
-    #define A7670_ResetPin  5
-    #define A7670_TX_PIN    26
-    #define A7670_RX_PIN    27
-#endif
-
-#ifdef WEMOS_D1_R32_RA02
-    #define RADIO_SCLK_PIN  18
-    #define RADIO_MISO_PIN  19
-    #define RADIO_MOSI_PIN  23
-    #define RADIO_CS_PIN    5
-    #define RADIO_BUSY_PIN  12
-    #define RADIO_RST_PIN   13
-    #define RADIO_DIO1_PIN  14
-    #define OLED_SDA        21
-    #define OLED_SCL        22
-    #define OLED_RST        36
-#endif
-
-#if defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915)
-    #define RADIO_SCLK_PIN      8
-    #define RADIO_MISO_PIN      9
-    #define RADIO_MOSI_PIN      10
-    #define RADIO_CS_PIN        5
-    #define RADIO_RST_PIN       4
-    #define RADIO_DIO1_PIN      2
-    #define RADIO_BUSY_PIN      3
-    #define RADIO_RXEN          6
-    #define RADIO_TXEN          7
-#endif
-
-#ifdef WEMOS_S2_MINI_DIY_LoRa
-    #define RADIO_SCLK_PIN  36
-    #define RADIO_MISO_PIN  37
-    #define RADIO_MOSI_PIN  35
-    #define RADIO_CS_PIN    34
-    #define RADIO_BUSY_PIN  38
-    #define RADIO_RST_PIN   33
-#endif
-
-
-// OLED 
-#if defined(TTGO_T_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_0_915) || defined(TTGO_T_Beam_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2)
-    #define OLED_SDA    21
-    #define OLED_SCL    22
-    #define OLED_RST    -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-#endif
-
-#if defined(HELTEC_V2) || defined(HELTEC_WS)
-    #define OLED_SDA    4
-    #define OLED_SCL    15
-    #define OLED_RST    16
-#endif
-
-#if defined(HELTEC_V3)
-    #define OLED_SDA    17
-    #define OLED_SCL    18
-    #define OLED_RST    21
-#endif
-
-#ifdef WEMOS_LOLIN32_OLED_DIY_LoRa
-    #define OLED_SDA    5
-    #define OLED_SCL    4
-    #define OLED_RST    -1
-#endif
-
-#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915) && !defined(WEMOS_S2_MINI_DIY_LoRa)
-    #define HAS_DISPLAY
-#endif
-
-// Leds and other stuff
-#ifdef HELTEC_HTCT62
-    #define BATTERY_PIN         1
-#endif
-#ifdef WEMOS_S2_MINI_DIY_LoRa
-    #define INTERNAL_LED_PIN    15
-#endif
-#if defined(TTGO_T_LORA32_V2_1) || defined(TTGO_T_LORA32_V2_1_915)
-    #define INTERNAL_LED_PIN    25      // Green Led
-    #define BATTERY_PIN         35
-#endif
-#if defined(HELTEC_V2)
-    #define INTERNAL_LED_PIN    25
-    #define BATTERY_PIN         37
-    #define ADC_CTRL            21
-#endif
-#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WS)
-    #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
-    #ifdef HELTEC_WSL_V3_DISPLAY
-        #define OLED_RST    -1
-    #endif
-#endif
-
-#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
-    #define INTERNAL_LED_PIN    2
-#endif
-#if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
-    #define INTERNAL_LED_PIN    13      // 13 for V1.1 and 12 for V1.0
-    #define BATTERY_PIN         35
-#endif
-
-#ifdef HELTEC_WIRELESS_TRACKER
-    #define INTERNAL_LED_PIN    18
-    #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
-#endif
-
-#ifdef HELTEC_WP
-    #define INTERNAL_LED_PIN    18
-    #define BATTERY_PIN         20
-    #define ADC_CTRL            19
-    #define VEXT_CTRL           45
-    #define BOARD_I2C_SDA       37
-    #define BOARD_I2C_SCL       36
-    #define EPAPER_BUSY         7
-    #define EPAPER_RST          6
-    #define EPAPER_DC           5
-    #define EPAPER_CS           4
-    #define EPAPER_SCL          3
-    #define EPAPER_SDA          2
-#endif
-
-#ifdef ESP32_C3_DIY_LoRa        // just testing!
-    #define OLED_SDA         8
-    #define OLED_SCL         9
-    #define OLED_RST         10
-    #define RADIO_SCLK_PIN   4
-    #define RADIO_MISO_PIN   5
-    #define RADIO_MOSI_PIN   6
-    #define RADIO_CS         7
-    #define RADIO_RST_PIN    3
-    #define RADIO_IRQ_PIN    2
-#endif
-
-#if defined(ESP32_C3_OctopusLab_LoRa)
-    #define OLED_SDA            0
-    #define OLED_SCL            1
-    #define OLED_RST            -1
-    #define RADIO_SCLK_PIN      6
-    #define RADIO_MISO_PIN      4
-    #define RADIO_MOSI_PIN      7
-    #define RADIO_CS_PIN        5
-    #define RADIO_DIO1_PIN      3
-    #define RADIO_RST_PIN       -1
-    #define RADIO_BUSY_PIN      8
-#endif
-
-/* (Same pins for LILYGO LoRa32 and ESP32 Wroom Dev )
-SX1278-------------------> ESP32 ttgo-lora32-v21 and ESP32 WROOM Dev
-GND                         GND
-DIO1                        -
-DIO2                        -
-DIO3                        -
-VCC                         3.3V
-MISO                        19
-MOSI                        27
-SCLK                        5
-NSS                         18
-DIO0                        26
-REST                        14
-GND                         -  */
-
-#endif

src/configuration.cpp

@@ -40,6 +40,9 @@ void Configuration::writeFile() {
     data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
     data["beacon"]["path"]                      = beacon.path;
 
+    data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
+
     data["digi"]["mode"]                        = digi.mode;
     data["digi"]["ecoMode"]                     = digi.ecoMode;
 
@@ -68,7 +71,7 @@ void Configuration::writeFile() {
     data["battery"]["voltageDividerR2"]         = battery.voltageDividerR2;
 
     data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
-    
+
     data["wxsensor"]["active"]                  = wxsensor.active;
     data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
     data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
@@ -100,6 +103,8 @@ void Configuration::writeFile() {
     data["webadmin"]["username"]                = webadmin.username;
     data["webadmin"]["password"]                = webadmin.password;
 
+    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+
     serializeJson(data, configFile);
 
     configFile.close();
@@ -144,7 +149,10 @@ bool Configuration::readFile() {
         beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
         beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
         beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
-        
+
+        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";
@@ -152,7 +160,7 @@ bool Configuration::readFile() {
         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;
-        
+
         digi.mode                       = data["digi"]["mode"] | 0;
         digi.ecoMode                    = data["digi"]["ecoMode"] | false;
 
@@ -187,7 +195,7 @@ bool Configuration::readFile() {
         wxsensor.temperatureCorrection  = data["wxsensor"]["temperatureCorrection"] | 0.0;
 
         syslog.active                   = data["syslog"]["active"] | false;
-        syslog.server                   = data["syslog"]["server"] | "192.168.0.100";
+        syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
         syslog.port                     = data["syslog"]["port"] | 514;
 
         tnc.enableServer                = data["tnc"]["enableServer"] | false;
@@ -201,6 +209,8 @@ bool Configuration::readFile() {
         webadmin.username               = data["webadmin"]["username"] | "admin";
         webadmin.password               = data["webadmin"]["password"] | "";
 
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0;
+
         lowPowerMode                    = data["other"]["lowPowerMode"] | false;
         lowVoltageCutOff                = data["other"]["lowVoltageCutOff"] | 0;
 
@@ -249,7 +259,10 @@ void Configuration::init() {
     beacon.sendViaAPRSIS            = true;
     beacon.sendViaRF                = false;
     beacon.path                     = "WIDE1-1";
-    
+
+    beacon.gpsActive                = false;
+    beacon.gpsAmbiguity             = false;
+
     digi.mode                       = 0;
     digi.ecoMode                    = false;
 
@@ -279,7 +292,7 @@ void Configuration::init() {
     display.turn180                 = false;
 
     syslog.active                   = false;
-    syslog.server                   = "192.168.0.100";
+    syslog.server                   = "lora.link9.net";
     syslog.port                     = 514;
 
     wxsensor.active                 = false;
@@ -302,7 +315,7 @@ void Configuration::init() {
     battery.voltageDividerR1        = 100.0;
     battery.voltageDividerR2        = 27.0;
 
-    battery.sendVoltageAsTelemetry  = true;
+    battery.sendVoltageAsTelemetry  = false;
 
     lowPowerMode                    = false;
     lowVoltageCutOff                = 0;
@@ -318,6 +331,8 @@ void Configuration::init() {
     webadmin.username               = "admin";
     webadmin.password               = "";
 
+    ntp.gmtCorrection               = 0;
+
     Serial.println("All is Written!");
 }
 

src/configuration.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <FS.h>
 
+
 class WiFi_AP {
 public:
     String  ssid;
@@ -28,6 +29,8 @@ public:
     String  path;    
     bool    sendViaRF;
     bool    sendViaAPRSIS;
+    bool    gpsActive;
+    bool    gpsAmbiguity;
 };
 
 class APRS_IS {
@@ -115,6 +118,13 @@ public:
     String  password;
 };
 
+class NTP {
+public:
+    int     gmtCorrection;
+};
+
+
+
 class Configuration {
 public:
     String                  callsign;
@@ -138,6 +148,7 @@ public:
     TNC                     tnc;  
     OTA                     ota;
     WEBADMIN                webadmin;
+    NTP                     ntp;
   
     void init();
     void writeFile();

src/digi_utils.cpp

@@ -54,7 +54,7 @@ namespace DIGI_Utils {
                 packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":")));
             }
             return packetToRepeat;
-        } else {   // CrossFreq Digirepeater
+        } else {   // CrossFreq Digipeater
             String suffix = thirdParty ? ":}" : ":";
             String packetToRepeat = packet.substring(0, packet.indexOf(suffix));
             
@@ -73,7 +73,7 @@ namespace DIGI_Utils {
         }
     }
 
-    String generateDigiRepeatedPacket(const String& packet, bool thirdParty){
+    String generateDigipeatedPacket(const String& packet, bool thirdParty){
         String temp;
         if (thirdParty) { // only header is used
             const String& header = packet.substring(0, packet.indexOf(":}"));
@@ -147,7 +147,7 @@ namespace DIGI_Utils {
                             }
                         }
                         if (!queryMessage) {
-                            String loraPacket = generateDigiRepeatedPacket(packet.substring(3), thirdPartyPacket);
+                            String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
                             if (loraPacket != "") {
                                 if (Config.lowPowerMode) {
                                     LoRa_Utils::sendNewPacket(loraPacket);

src/digi_utils.h

@@ -7,7 +7,7 @@
 namespace DIGI_Utils {
 
     String  buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq);
-    String  generateDigiRepeatedPacket(const String& packet, bool thirdParty);
+    String  generateDigipeatedPacket(const String& packet, bool thirdParty);
     void    processLoRaPacket(const String& packet);
     void    checkEcoMode();
 

src/display.cpp

@@ -1,6 +1,6 @@
 #include <Wire.h>
 #include "configuration.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "display.h"
 
 
@@ -11,12 +11,12 @@
         TFT_eSPI tft = TFT_eSPI(); 
 
         #ifdef HELTEC_WIRELESS_TRACKER
-            #define bigSizeFont     2.5
-            #define smallSizeFont   1.5
-            #define lineSpacing     12
+            #define bigSizeFont     2
+            #define smallSizeFont   1
+            #define lineSpacing     10
         #endif
     #else
-        #if HAS_EPAPER
+        #ifdef HAS_EPAPER
             //
         #else
             #include <Adafruit_GFX.h>
@@ -33,9 +33,11 @@
     #endif
 #endif
     
-extern Configuration Config;
+extern  Configuration   Config;
+
+String  oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
+bool    displayFound    = false;
 
-String oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
 
 void cleanTFT() {
     #ifdef HAS_TFT
@@ -57,7 +59,7 @@ void displaySetup() {
             tft.setTextFont(0);
             tft.fillScreen(TFT_BLACK);
         #else
-            #if HAS_EPAPER
+            #ifdef HAS_EPAPER
                 //
             #else
                 #ifdef OLED_DISPLAY_HAS_RST_PIN
@@ -67,20 +69,17 @@ void displaySetup() {
                     digitalWrite(OLED_RST, HIGH);
                 #endif
 
-                if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { 
-                    Serial.println(F("SSD1306 allocation failed"));
-                    for(;;); // Don't proceed, loop forever
+                if(display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
+                    displayFound = true;
+                    if (Config.display.turn180) display.setRotation(2);
+                    display.clearDisplay();
+                    display.setTextColor(WHITE);
+                    display.setTextSize(1);
+                    display.setCursor(0, 0);
+                    display.ssd1306_command(SSD1306_SETCONTRAST);
+                    display.ssd1306_command(1);
+                    display.display();
                 }
-                if (Config.display.turn180) {
-                    display.setRotation(2);
-                }
-                display.clearDisplay();
-                display.setTextColor(WHITE);
-                display.setTextSize(1);
-                display.setCursor(0, 0);
-                display.ssd1306_command(SSD1306_SETCONTRAST);
-                display.ssd1306_command(1);
-                display.display();
             #endif
         #endif
         delay(1000);
@@ -93,20 +92,20 @@ void displayToggle(bool toggle) {
             #ifdef HAS_TFT
                 digitalWrite(TFT_BL, HIGH);
             #else
-                #if HAS_EPAPER
+                #ifdef HAS_EPAPER
                     // ... to be continued
                 #else
-                    display.ssd1306_command(SSD1306_DISPLAYON);
+                    if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
                 #endif
             #endif
         } else {
             #ifdef HAS_TFT
                 digitalWrite(TFT_BL, LOW);
             #else
-                #if HAS_EPAPER
+                #ifdef HAS_EPAPER
                     // ... to be continued
                 #else
-                    display.ssd1306_command(SSD1306_DISPLAYOFF);
+                    if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
                 #endif
             #endif
         }
@@ -160,18 +159,20 @@ void displayShow(const String& header, const String& line1, const String& line2,
             #ifdef HAS_EPAPER
                 // ... to be continued
             #else
-                display.clearDisplay();
-                display.setTextColor(WHITE);
-                display.setTextSize(1);
-                display.setCursor(0, 0);
-                display.println(header);
-                for (int i = 0; i < 3; i++) {
-                    display.setCursor(0, 8 + (8 * i));
-                    display.println(*lines[i]);
+                if (displayFound) {
+                    display.clearDisplay();
+                    display.setTextColor(WHITE);
+                    display.setTextSize(1);
+                    display.setCursor(0, 0);
+                    display.println(header);
+                    for (int i = 0; i < 3; i++) {
+                        display.setCursor(0, 8 + (8 * i));
+                        display.println(*lines[i]);
+                    }
+                    display.ssd1306_command(SSD1306_SETCONTRAST);
+                    display.ssd1306_command(1);
+                    display.display();
                 }
-                display.ssd1306_command(SSD1306_SETCONTRAST);
-                display.ssd1306_command(1);
-                display.display();
             #endif
         #endif
         delay(wait);
@@ -198,19 +199,21 @@ void displayShow(const String& header, const String& line1, const String& line2,
             #ifdef HAS_EPAPER
                 // ... to be continued
             #else
-                display.clearDisplay();
-                display.setTextColor(WHITE);
-                display.setTextSize(2);
-                display.setCursor(0, 0);
-                display.println(header);
-                display.setTextSize(1);
-                for (int i = 0; i < 6; i++) {
-                    display.setCursor(0, 16 + (8 * i));
-                    display.println(*lines[i]);
+                if (displayFound) {
+                    display.clearDisplay();
+                    display.setTextColor(WHITE);
+                    display.setTextSize(2);
+                    display.setCursor(0, 0);
+                    display.println(header);
+                    display.setTextSize(1);
+                    for (int i = 0; i < 6; i++) {
+                        display.setCursor(0, 16 + (8 * i));
+                        display.println(*lines[i]);
+                    }
+                    display.ssd1306_command(SSD1306_SETCONTRAST);
+                    display.ssd1306_command(1);
+                    display.display();
                 }
-                display.ssd1306_command(SSD1306_SETCONTRAST);
-                display.ssd1306_command(1);
-                display.display();
             #endif
         #endif
         delay(wait);

src/display.h

@@ -5,6 +5,7 @@
 
 #define SCREEN_ADDRESS  0x3C    ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
 
+
 void cleanTFT();
 void displaySetup();
 void displayToggle(bool toggle);

src/gps_utils.cpp

@@ -1,13 +1,22 @@
 #include <TinyGPS++.h>
 #include <WiFi.h>
 #include "configuration.h"
+#include "board_pinout.h"
 #include "gps_utils.h"
 #include "display.h"
 #include "utils.h"
 
-extern Configuration  Config;
-extern WiFiClient     espClient;
-String                distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
+#ifdef GPS_BAUDRATE
+    #define GPS_BAUD    GPS_BAUDRATE
+#else
+    #define GPS_BAUD    9600
+#endif
+
+extern Configuration    Config;
+extern WiFiClient       espClient;
+extern HardwareSerial   gpsSerial;
+extern TinyGPSPlus      gps;
+String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
 
 
 namespace GPS_Utils {
@@ -24,20 +33,32 @@ namespace GPS_Utils {
         return(s);
     }
 
+    float roundToTwoDecimals(float degrees) {
+        return round(degrees * 100) / 100;
+    }
+
     String encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol) {
         String encodedData = overlay;
         uint32_t aprs_lat, aprs_lon;
-        aprs_lat = 900000000 - latitude * 10000000;
+
+        float processedLatitude     = latitude;
+        float processedLongitude    = longitude;
+        if (Config.beacon.gpsActive && Config.beacon.gpsAmbiguity) {
+            processedLatitude       = roundToTwoDecimals(latitude);
+            processedLongitude      = roundToTwoDecimals(longitude);
+        }
+
+        aprs_lat = 900000000 - processedLatitude * 10000000;
         aprs_lat = aprs_lat / 26 - aprs_lat / 2710 + aprs_lat / 15384615;
-        aprs_lon = 900000000 + longitude * 10000000 / 2;
+        aprs_lon = 900000000 + processedLongitude * 10000000 / 2;
         aprs_lon = aprs_lon / 26 - aprs_lon / 2710 + aprs_lon / 15384615;
 
         String Ns, Ew, helper;
-        if(latitude < 0) { Ns = "S"; } else { Ns = "N"; }
-        if(latitude < 0) { latitude= -latitude; }
+        if(processedLatitude < 0) { Ns = "S"; } else { Ns = "N"; }
+        if(processedLatitude < 0) { processedLatitude = -processedLatitude; }
 
-        if(longitude < 0) { Ew = "W"; } else { Ew = "E"; }
-        if(longitude < 0) { longitude= -longitude; }
+        if(processedLongitude < 0) { Ew = "W"; } else { Ew = "E"; }
+        if(processedLongitude < 0) { processedLongitude = -processedLongitude; }
 
         char helper_base91[] = {"0000\0"};
         int i;
@@ -55,6 +76,19 @@ namespace GPS_Utils {
         return encodedData;
     }
 
+    void generateBeaconFirstPart() {
+        String beaconPacket = Config.callsign;
+        beaconPacket += ">APLRG1";
+        if (Config.beacon.path.indexOf("WIDE") == 0) {
+            beaconPacket += ",";
+            beaconPacket += Config.beacon.path;
+        }
+        iGateBeaconPacket       = beaconPacket;
+        iGateBeaconPacket       += ",qAC:!";
+        iGateLoRaBeaconPacket   = beaconPacket;
+        iGateLoRaBeaconPacket   += ":!";
+    }
+
     void generateBeacons() {
         if (Config.callsign.indexOf("NOCALL-10") != 0 && !Utils::checkValidCallsign(Config.callsign)) {
             displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
@@ -64,19 +98,8 @@ namespace GPS_Utils {
             Config.beacon.sendViaRF     = false;
             Config.digi.mode            = 0;
             Config.backupDigiMode       = false;
-        }   
-        String beaconPacket = Config.callsign;
-        beaconPacket += ">APLRG1";
-        if (Config.beacon.path.indexOf("WIDE") == 0) {
-            beaconPacket += ",";
-            beaconPacket += Config.beacon.path;
         }
-
-        iGateBeaconPacket       = beaconPacket;
-        iGateBeaconPacket       += ",qAC:!";
-        iGateLoRaBeaconPacket   = beaconPacket;
-        iGateLoRaBeaconPacket   += ":!";
-
+        generateBeaconFirstPart();
         String encodedGPS       = encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);
         iGateBeaconPacket       += encodedGPS;        
         iGateLoRaBeaconPacket   += encodedGPS;
@@ -184,4 +207,19 @@ namespace GPS_Utils {
         }
     }
 
+    void setup() {
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive) {
+                gpsSerial.begin(GPS_BAUD, SERIAL_8N1, GPS_TX, GPS_RX);
+            }
+        #endif
+        generateBeacons();
+    }
+
+    void getData() {
+        while (gpsSerial.available() > 0) {
+            gps.encode(gpsSerial.read());
+        }
+    }
+
 }

src/gps_utils.h

@@ -5,16 +5,19 @@
 
 
 namespace GPS_Utils {
-
+    
     String  getiGateLoRaBeaconPacket();
     char    *ax25_base91enc(char *s, uint8_t n, uint32_t v);
     String  encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol);
+    void    generateBeaconFirstPart();
     void    generateBeacons();
-    //double  calculateDistanceCourse(double latitude, double longitude);
     String  decodeEncodedGPS(const String& packet);
     String  getReceivedGPS(const String& packet);
     String  getDistanceAndComment(const String& packet);
 
+    void    setup();
+    void    getData();
+
 }
 
 #endif

src/kiss_utils.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 
+
 String encodeAddressAX25(String tnc2Address);
 String decodeAddressAX25(const String& ax25Address, bool& isLast, bool isRelay);
 

src/lora_utils.cpp

@@ -2,8 +2,9 @@
 #include <WiFi.h>
 #include "configuration.h"
 #include "aprs_is_utils.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
+#include "ntp_utils.h"
 #include "display.h"
 #include "utils.h"
 
@@ -19,7 +20,12 @@ bool transmitFlag    = true;
     SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
 #endif
 #ifdef HAS_SX1268
-    SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
+    #if defined(LIGHTGATEWAY_1_0)
+        SPIClass loraSPI(FSPI);
+        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI); 
+    #else
+        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
+    #endif
 #endif
 #ifdef HAS_SX1278
     SX1278 radio = new Module(RADIO_CS_PIN, RADIO_BUSY_PIN, RADIO_RST_PIN);
@@ -34,6 +40,7 @@ bool transmitFlag    = true;
 int rssi, freqError;
 float snr;
 
+
 namespace LoRa_Utils {
 
     void setFlag(void) {
@@ -41,7 +48,13 @@ namespace LoRa_Utils {
     }
 
     void setup() {
-        SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
+        #ifdef LIGHTGATEWAY_1_0
+            pinMode(RADIO_VCC_PIN,OUTPUT);
+            digitalWrite(RADIO_VCC_PIN,HIGH);
+            loraSPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN, RADIO_CS_PIN);
+        #else
+            SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
+        #endif
         float freq = (float)Config.loramodule.rxFreq / 1000000;
         #if defined(RADIO_HAS_XTAL)
             radio.XTAL = true;
@@ -69,7 +82,7 @@ namespace LoRa_Utils {
         radio.setCodingRate(Config.loramodule.codingRate4);
         radio.setCRC(true);
 
-        #if defined(RADIO_RXEN) && defined(RADIO_TXEN)
+        #if (defined(RADIO_RXEN) && defined(RADIO_TXEN)) || defined(LIGHTGATEWAY_1_0)   // QRP Labs LightGateway has 400M22S (SX1268)
             radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
         #endif
 
@@ -175,15 +188,15 @@ namespace LoRa_Utils {
                         Utils::println("<--- LoRa Packet Rx    : " + packet.substring(3));
                         Utils::println("(RSSI:" + String(rssi) + " / SNR:" + String(snr) + " / FreqErr:" + String(freqError) + ")");
 
-                        if (!Config.lowPowerMode) {
+                        if (!Config.lowPowerMode && !Config.digi.ecoMode) {
+                            if (receivedPackets.size() >= 10) {
+                                receivedPackets.erase(receivedPackets.begin());
+                            }
                             ReceivedPacket receivedPacket;
-                            receivedPacket.millis   = millis();
+                            receivedPacket.rxTime   = NTP_Utils::getFormatedTime();
                             receivedPacket.packet   = packet.substring(3);
                             receivedPacket.RSSI     = rssi;
                             receivedPacket.SNR      = snr;
-                            if (receivedPackets.size() >= 20) {
-                                receivedPackets.erase(receivedPackets.begin());
-                            }
                             receivedPackets.push_back(receivedPacket);
                         }
 
@@ -192,7 +205,7 @@ namespace LoRa_Utils {
                         }
                         lastRxTime = millis();
                         return packet;
-                    }                
+                    }
                 } else if (state == RADIOLIB_ERR_CRC_MISMATCH) {
                     rssi        = radio.getRSSI();
                     snr         = radio.getSNR();

src/lora_utils.h

@@ -12,7 +12,7 @@ namespace LoRa_Utils {
     String  receivePacket();
     void    changeFreqTx();
     void    changeFreqRx();
-    void    startReceive(); // ???
+    void    startReceive();
     void    sleepRadio();
 
 }

src/ntp_utils.cpp

@@ -0,0 +1,34 @@
+#include <NTPClient.h>
+#include <WiFiUdp.h>
+#include <WiFi.h>
+#include "configuration.h"
+#include "ntp_utils.h"
+#include "time.h"
+
+
+extern      Configuration  Config;
+
+WiFiUDP     ntpUDP;
+NTPClient   timeClient(ntpUDP, "pool.ntp.org", 0, 15 * 60 * 1000);  // Update interval 15 min
+
+
+namespace NTP_Utils {
+
+    void setup() {
+        if (WiFi.status() == WL_CONNECTED && !Config.digi.ecoMode && Config.callsign != "NOCALL-10") {
+            int gmt = Config.ntp.gmtCorrection * 3600;
+            timeClient.setTimeOffset(gmt);
+            timeClient.begin();
+        }
+    }
+
+    void update() {
+        if (WiFi.status() == WL_CONNECTED && !Config.digi.ecoMode && Config.callsign != "NOCALL-10") timeClient.update();
+    }
+
+    String getFormatedTime() {
+        if (!Config.digi.ecoMode) return timeClient.getFormattedTime();
+        return "DigiEcoMode Active";
+    }
+
+}

src/ntp_utils.h

@@ -0,0 +1,15 @@
+#ifndef NTP_UTILS_H_
+#define NTP_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace NTP_Utils {
+
+    void    setup();
+    void    update();
+    String  getFormatedTime();
+
+}
+
+#endif

src/power_utils.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 #include "battery_utils.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "power_utils.h"
 
 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
@@ -47,6 +47,36 @@ namespace POWER_Utils {
         #endif
     }
 
+    void activateGPS() {
+        #ifdef HAS_AXP192
+            PMU.setLDO3Voltage(3300);
+            PMU.enableLDO3();
+        #endif
+
+        #ifdef HAS_AXP2101
+                PMU.setALDO3Voltage(3300);
+                PMU.enableALDO3();
+        #endif
+        #ifdef HELTEC_WIRELESS_TRACKER
+            digitalWrite(VEXT_CTRL, HIGH);
+        #endif
+        //gpsIsActive = true;
+    }
+
+    void deactivateGPS() {
+        #ifdef HAS_AXP192
+            PMU.disableLDO3();
+        #endif
+
+        #ifdef HAS_AXP2101
+            PMU.disableALDO3();
+        #endif
+        #ifdef HELTEC_WIRELESS_TRACKER
+            digitalWrite(VEXT_CTRL, LOW);
+        #endif
+        //gpsIsActive = false;
+    }
+
     void activateLoRa() {
         #ifdef HAS_AXP192
             PMU.setLDO2Voltage(3300);
@@ -159,6 +189,10 @@ namespace POWER_Utils {
             #endif
         #endif
         
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive) activateGPS();
+        #endif
+
         #ifdef ADC_CTRL
             pinMode(ADC_CTRL, OUTPUT);
         #endif
@@ -171,7 +205,7 @@ namespace POWER_Utils {
             Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
-        #if defined(HELTEC_V3) || defined(HELTEC_WS)
+        #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2)
             Wire.begin(OLED_SDA, OLED_SCL);
         #endif
         

src/power_utils.h

@@ -14,6 +14,8 @@ namespace POWER_Utils {
     double  getBatteryVoltage();
     bool    isBatteryConnected();
     void    activateMeasurement();
+    void    activateGPS();
+    void    deactivateGPS();
     void    activateLoRa();
     void    deactivateLoRa();
     bool    begin(TwoWire &port);

src/query_utils.cpp

@@ -51,15 +51,15 @@ namespace QUERY_Utils {
             // agregar callsign para completar donde esta X callsign --> posicion
             Serial.println("estaciones escuchadas directo (ultimos 30 min)");
             answer.concat("?WHERE on development 73!");
-        } else if (queryQuestion.indexOf("?APRSEEM") == 0) {    // Exit DigiRepeater EcoMode
+        } else if (queryQuestion.indexOf("?APRSEEM") == 0 && Config.digi.ecoMode == true) {    // Exit Digipeater EcoMode
             answer = "DigiEcoMode:Stop";
             Config.digi.ecoMode     = false;
             Config.display.alwaysOn = true;
             Config.display.timeout  = 10;
-        } else if (queryQuestion.indexOf("?APRSSEM") == 0) {    // Start DigiRepeater EcoMode
+        } else if (queryQuestion.indexOf("?APRSSEM") == 0 && Config.digi.ecoMode == false) {    // Start Digipeater EcoMode
             answer = "DigiEcoMode:Start";
             Config.digi.ecoMode     = true;
-        } else if (queryQuestion.indexOf("?APRSEMS") == 0) {    // DigiRepeater EcoMode Status
+        } else if (queryQuestion.indexOf("?APRSEMS") == 0) {    // Digipeater EcoMode Status
             answer = (Config.digi.ecoMode) ? "DigiEcoMode:ON" : "DigiEcoMode:OFF";
         }
 

src/station_utils.h

@@ -16,7 +16,6 @@ struct LastHeardStation {
     String      station;
 };
 
-
 namespace STATION_Utils {
 
     void deleteNotHeard();

src/tnc_utils.cpp

@@ -19,6 +19,7 @@ WiFiServer tncServer(TNC_PORT);
 String inputServerBuffer[INPUT_BUFFER_SIZE];
 String inputSerialBuffer = "";
 
+
 namespace TNC_Utils {
     
     void setup() {

src/tnc_utils.h

@@ -3,6 +3,7 @@
 
 #include <Arduino.h>
 
+
 namespace TNC_Utils {
 
     void setup();

src/utils.cpp

@@ -1,9 +1,10 @@
+#include <TinyGPS++.h>
 #include <WiFi.h>
 #include "configuration.h"
 #include "station_utils.h"
 #include "battery_utils.h"
 #include "aprs_is_utils.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
 #include "A7670_utils.h"
 #include "lora_utils.h"
@@ -13,8 +14,10 @@
 #include "display.h"
 #include "utils.h"
 
+
 extern Configuration        Config;
 extern WiFiClient           espClient;
+extern TinyGPSPlus          gps;
 extern String               versionDate;
 extern String               firstLine;
 extern String               secondLine;
@@ -42,6 +45,8 @@ bool        sendStartTelemetry  = true;
 bool        beaconUpdate        = true;
 uint32_t    lastBeaconTx        = 0;
 uint32_t    lastScreenOn        = millis();
+String      beaconPacket;
+String      secondaryBeaconPacket;
 
 
 namespace Utils {
@@ -78,7 +83,7 @@ namespace Utils {
             return "- BACKUP DIGI MODE -";
         } else {
             return "IP :  " + String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(WiFi.localIP()[3]);
-        }        
+        }
     }
 
     void setupDisplay() {
@@ -106,7 +111,6 @@ namespace Utils {
         fourthLine.concat(String(lastHeardStations.size()));
     }
 
-
     void sendInitialTelemetryPackets() {
         String sender = Config.callsign;
         for (int i = sender.length(); i < 9; i++) {
@@ -118,11 +122,15 @@ namespace Utils {
         baseAPRSISTelemetryPacket += ":";
 
         String baseRFTelemetryPacket = Config.callsign;
-        baseRFTelemetryPacket += ">APLRG1,WIDE1-1::";
+        baseRFTelemetryPacket += ">APLRG1";
+        if (Config.beacon.path.indexOf("WIDE") != -1) {
+            baseRFTelemetryPacket += ",";
+            baseRFTelemetryPacket += Config.beacon.path;
+        }
+        baseRFTelemetryPacket += "::";
         baseRFTelemetryPacket += sender;
         baseRFTelemetryPacket += ":";
 
-
         String telemetryPacket1 = "EQNS.";
         if (Config.battery.sendInternalVoltage) {
             telemetryPacket1 += "0,0.01,0";
@@ -173,8 +181,7 @@ namespace Utils {
             delay(3000);
         }
         sendStartTelemetry = false;
-    }            
-
+    }
 
     void checkBeaconInterval() {
         uint32_t lastTx = millis() - lastBeaconTx;
@@ -182,6 +189,13 @@ namespace Utils {
             beaconUpdate = true;    
         }
 
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive && gps.location.lat() == 0.0 && gps.location.lng() == 0.0 && Config.beacon.latitude == 0.0 && Config.beacon.longitude == 0.0) {
+                GPS_Utils::getData();
+                beaconUpdate = false;
+            }
+        #endif
+
         if (beaconUpdate) {
             if (!Config.display.alwaysOn && Config.display.timeout != 0) {
                 displayToggle(true);
@@ -190,13 +204,25 @@ namespace Utils {
             if (sendStartTelemetry && Config.battery.sendVoltageAsTelemetry && !Config.wxsensor.active && (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage)) {
                 sendInitialTelemetryPackets();
             }
-            
+
             STATION_Utils::deleteNotHeard();
 
             activeStations();
 
-            String beaconPacket             = iGateBeaconPacket;
-            String secondaryBeaconPacket    = iGateLoRaBeaconPacket;
+            beaconPacket            = iGateBeaconPacket;
+            secondaryBeaconPacket   = iGateLoRaBeaconPacket;
+            #ifdef HAS_GPS
+                if (Config.beacon.gpsActive && !Config.digi.ecoMode) {
+                    GPS_Utils::getData();
+                    if (gps.location.isUpdated() && gps.location.lat() != 0.0 && gps.location.lng() != 0.0) {
+                        GPS_Utils::generateBeaconFirstPart();
+                        String encodedGPS = GPS_Utils::encodeGPS(gps.location.lat(), gps.location.lng(), Config.beacon.overlay, Config.beacon.symbol);
+                        beaconPacket = iGateBeaconPacket + encodedGPS;
+                        secondaryBeaconPacket = iGateLoRaBeaconPacket + encodedGPS;
+                    }
+                }
+            #endif
+
             if (Config.wxsensor.active && wxModuleType != 0) {
                 String sensorData = WX_Utils::readDataSensor();
                 beaconPacket += sensorData;
@@ -228,7 +254,7 @@ namespace Utils {
                             secondaryBeaconPacket   += " Batt=";
                             secondaryBeaconPacket   += internalVoltageInfo;
                         }
-                    }      
+                    }
                 }
             #endif
 
@@ -251,8 +277,8 @@ namespace Utils {
                             beaconPacket            += externalVoltageInfo;
                             secondaryBeaconPacket   += " Ext=";
                             secondaryBeaconPacket   += externalVoltageInfo;
-                        }                        
-                    }                    
+                        }
+                    }
                 }
             #endif
 
@@ -264,7 +290,7 @@ namespace Utils {
 
             if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
                 Utils::println("-- Sending Beacon to APRSIS --");
-                displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0); 
+                displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
                 seventhLine = "     listening...";
                 #ifdef HAS_A7670
                     A7670_Utils::uploadToAPRSIS(beaconPacket);
@@ -316,7 +342,7 @@ namespace Utils {
             case 1: // APRS-LoRa
                 fifthLine = "APRS-IS ----> LoRa Tx";
                 break;
-            case 2: // Digi
+            case 2: // Digipeater
                 fifthLine = "LoRa Rx ----> LoRa Tx";
                 break;
         }

src/utils.h

@@ -3,9 +3,10 @@
 
 #include <Arduino.h>
 
+
 class ReceivedPacket {
 public:
-    long    millis;
+    String  rxTime;
     String  packet;
     int     RSSI;
     float   SNR;

src/web_utils.cpp

@@ -34,6 +34,7 @@ extern const unsigned char favicon_data[] asm("_binary_data_embed_favicon_png_gz
 extern const unsigned char favicon_data_end[] asm("_binary_data_embed_favicon_png_gz_end");
 extern const size_t favicon_data_len = favicon_data_end - favicon_data;
 
+
 namespace WEB_Utils {
 
     AsyncWebServer server(80);
@@ -81,10 +82,10 @@ namespace WEB_Utils {
         StaticJsonDocument<1536> data;
 
         for (int i = 0; i < receivedPackets.size(); i++) {
-            data[i]["millis"] = receivedPackets[i].millis;
-            data[i]["packet"] = receivedPackets[i].packet;
-            data[i]["RSSI"] = receivedPackets[i].RSSI;
-            data[i]["SNR"] = receivedPackets[i].SNR;
+            data[i]["rxTime"]   = receivedPackets[i].rxTime;
+            data[i]["packet"]   = receivedPackets[i].packet;
+            data[i]["RSSI"]     = receivedPackets[i].RSSI;
+            data[i]["SNR"]      = receivedPackets[i].SNR;
         }
 
         String buffer;
@@ -134,6 +135,9 @@ namespace WEB_Utils {
         Config.beacon.symbol                = request->getParam("beacon.symbol", true)->value();
         Config.beacon.path                  = request->getParam("beacon.path", true)->value();
 
+        Config.beacon.gpsActive             = request->hasParam("beacon.gpsActive", true);
+        Config.beacon.gpsAmbiguity          = request->hasParam("beacon.gpsAmbiguity", true);
+
 
         Config.digi.mode                    = request->getParam("digi.mode", true)->value().toInt();
         Config.digi.ecoMode                 = request->hasParam("digi.ecoMode", true);
@@ -183,7 +187,7 @@ namespace WEB_Utils {
             Config.syslog.server            = request->getParam("syslog.server", true)->value();
             Config.syslog.port              = request->getParam("syslog.port", true)->value().toInt();
         }
-        
+
         Config.tnc.enableServer             = request->hasParam("tnc.enableServer", true);
         Config.tnc.enableSerial             = request->hasParam("tnc.enableSerial", true);
         Config.tnc.acceptOwn                = request->hasParam("tnc.acceptOwn", true);
@@ -208,6 +212,8 @@ namespace WEB_Utils {
             Config.webadmin.password        = request->getParam("webadmin.password", true)->value();
         }
 
+        Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toInt();
+
         Config.writeFile();
 
         AsyncWebServerResponse *response    = request->beginResponse(302, "text/html", "");

src/web_utils.h

@@ -13,10 +13,6 @@ namespace WEB_Utils {
     void handleNotFound(AsyncWebServerRequest *request);
     void handleStatus(AsyncWebServerRequest *request);
     void handleHome(AsyncWebServerRequest *request);
-
-    //void handleReadConfiguration(AsyncWebServerRequest *request);
-    //void handleWriteConfiguration(AsyncWebServerRequest *request);
-
     void handleStyle(AsyncWebServerRequest *request);
     void handleScript(AsyncWebServerRequest *request);
     void handleBootstrapStyle(AsyncWebServerRequest *request);

src/wifi_utils.cpp

@@ -1,6 +1,6 @@
 #include <WiFi.h>
 #include "configuration.h"
-#include "boards_pinout.h"
+#include "board_pinout.h"
 #include "wifi_utils.h"
 #include "display.h"
 #include "utils.h"
@@ -27,11 +27,11 @@ namespace WIFI_Utils {
             if (backUpDigiMode) {
                 uint32_t WiFiCheck = millis() - lastBackupDigiTime;
                 if (WiFi.status() != WL_CONNECTED && WiFiCheck >= 15 * 60 * 1000) {
-                    Serial.println("*** Stoping BackUp Digi Mode ***");
+                    Serial.println("*** Stopping BackUp Digi Mode ***");
                     backUpDigiMode = false;
                     wifiCounter = 0;
                 } else if (WiFi.status() == WL_CONNECTED) {
-                    Serial.println("*** WiFi Reconnect Success (Stoping Backup Digi Mode) ***");
+                    Serial.println("*** WiFi Reconnect Success (Stopping Backup Digi Mode) ***");
                     backUpDigiMode = false;
                     wifiCounter = 0;
                 }
@@ -78,7 +78,7 @@ namespace WIFI_Utils {
             WiFi.disconnect();
             delay(500);
             unsigned long start = millis();
-            displayShow("", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0);
+            displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
             Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
             WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
             while (WiFi.status() != WL_CONNECTED && wifiCounter<myWiFiAPSize) {
@@ -103,7 +103,7 @@ namespace WIFI_Utils {
                     currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
                     start = millis();
                     Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
-                    displayShow("", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0);
+                    displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
                     WiFi.disconnect();
                     WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
                 }

src/wx_utils.cpp

@@ -1,11 +1,10 @@
 #include "configuration.h"
-#include "gps_utils.h"
 #include "wx_utils.h"
 #include "display.h"
 
 
-#define SEALEVELPRESSURE_HPA (1013.25)
-#define CORRECTION_FACTOR (8.2296)      // for meters
+#define SEALEVELPRESSURE_HPA    (1013.25)
+#define CORRECTION_FACTOR       (8.2296)      // for meters
 
 extern Configuration            Config;
 extern String                   fifthLine;
@@ -126,7 +125,7 @@ namespace WX_Utils {
                             break;
                     }
                 }
-            }            
+            }
         }
     }
 
@@ -233,7 +232,7 @@ namespace WX_Utils {
                 presStr = ".....";
             } else {
                 presStr = generatePresString(newPress + (Config.wxsensor.heightCorrection/CORRECTION_FACTOR));
-            }           
+            }
             
             fifthLine = "BME-> ";
             fifthLine += String(int(newTemp + Config.wxsensor.temperatureCorrection));

variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h

@@ -0,0 +1,26 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define RADIO_HAS_XTAL
+    #define RADIO_SCLK_PIN          6
+    #define RADIO_MISO_PIN          4
+    #define RADIO_MOSI_PIN          7
+    #define RADIO_CS_PIN            5
+    #define RADIO_DIO1_PIN          3
+    #define RADIO_RST_PIN           -1
+    #define RADIO_BUSY_PIN          8
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                0
+    #define OLED_SCL                1
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+    
+#endif

variants/ESP32_C3_OctopusLab_LoRa/platformio.ini

@@ -0,0 +1,10 @@
+[env:ESP32_C3_OctopusLab_LoRa]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D ESP32_C3_OctopusLab_LoRa
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/ESP32_DIY_1W_LoRa/board_pinout.h

@@ -0,0 +1,31 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+
+    //  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        2
+
+#endif

variants/ESP32_DIY_1W_LoRa/platformio.ini

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

variants/ESP32_DIY_1W_LoRa_915/board_pinout.h

@@ -0,0 +1,31 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+
+    //  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        2
+
+#endif

variants/ESP32_DIY_1W_LoRa_915/platformio.ini

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

variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h

@@ -0,0 +1,28 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_LLCC68
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+
+    //  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)
+
+#endif

variants/ESP32_DIY_1W_LoRa_LLCC68/platformio.ini

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

variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h

@@ -0,0 +1,28 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          5   // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           23
+    #define RADIO_DIO1_PIN          33
+    #define RADIO_BUSY_PIN          32
+    #define RADIO_RXEN              14
+    #define RADIO_TXEN              13
+
+    //  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)
+
+#endif

variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/platformio.ini

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

variants/ESP32_DIY_LoRa/board_pinout.h

@@ -0,0 +1,27 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #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
+
+    //  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        2
+
+#endif

variants/ESP32_DIY_LoRa/platformio.ini

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

variants/ESP32_DIY_LoRa_915/board_pinout.h

@@ -0,0 +1,27 @@
+#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
+
+    //  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        2
+
+#endif

variants/ESP32_DIY_LoRa_915/platformio.ini

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

variants/ESP32_DIY_LoRa_A7670/board_pinout.h

@@ -0,0 +1,34 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            2
+    #define RADIO_RST_PIN           0
+    #define RADIO_BUSY_PIN          32
+
+    //  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        13      // 13 for V1.1 and 12 for V1.0
+    #define BATTERY_PIN             35    
+    
+    #define HAS_A7670
+    #define A7670_PWR_PIN           4
+    #define A7670_ResetPin          5
+    #define A7670_TX_PIN            26
+    #define A7670_RX_PIN            27
+
+#endif

variants/ESP32_DIY_LoRa_A7670/platformio.ini

@@ -0,0 +1,10 @@
+[env:ESP32_DIY_LoRa_A7670]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D ESP32_DIY_LoRa_A7670
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
+	vshymanskyy/TinyGSM @ 0.12.0
+	vshymanskyy/StreamDebugger @ 1.0.1

variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h

@@ -0,0 +1,34 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1276
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            2
+    #define RADIO_RST_PIN           0
+    #define RADIO_BUSY_PIN          32
+
+    //  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        13      // 13 for V1.1 and 12 for V1.0
+    #define BATTERY_PIN             35
+
+    #define HAS_A7670
+    #define A7670_PWR_PIN           4
+    #define A7670_ResetPin          5
+    #define A7670_TX_PIN            26
+    #define A7670_RX_PIN            27
+
+#endif

variants/ESP32_DIY_LoRa_A7670_915/platformio.ini

@@ -0,0 +1,10 @@
+[env:ESP32_DIY_LoRa_A7670_915]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D ESP32_DIY_LoRa_A7670_915
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
+	vshymanskyy/TinyGSM @ 0.12.0
+	vshymanskyy/StreamDebugger @ 1.0.1

variants/OE5HWN_MeshCom/board_pinout.h

@@ -0,0 +1,28 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          33
+    #define RADIO_BUSY_PIN          26
+    #define RADIO_RXEN              14
+    #define RADIO_TXEN              13
+
+    //  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)
+
+#endif

variants/OE5HWN_MeshCom/platformio.ini

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

variants/QRPLabs_LightGateway_1_0/board_pinout.h

@@ -0,0 +1,33 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define RADIO_VCC_PIN           21
+    #define RADIO_SCLK_PIN          12
+    #define RADIO_MISO_PIN          13
+    #define RADIO_MOSI_PIN          11
+    #define RADIO_CS_PIN            10
+    #define RADIO_RST_PIN           9
+    #define RADIO_DIO1_PIN          5
+    #define RADIO_BUSY_PIN          6
+    #define RADIO_RXEN              42
+    #define RADIO_TXEN              14
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                3
+    #define OLED_SCL                4
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        16
+    #define BATTERY_PIN             1
+    #define BUTTON_PIN              0
+
+#endif

variants/QRPLabs_LightGateway_1_0/platformio.ini

@@ -0,0 +1,10 @@
+[env:QRPLabs_LightGateway_1_0]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D LIGHTGATEWAY_1_0
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

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

@@ -0,0 +1,25 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           13
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          12
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                36
+
+#endif

variants/WEMOS-D1-R32-RA02/platformio.ini

@@ -0,0 +1,8 @@
+[env:WEMOS-D1-R32-RA02]
+board = wemos_d1_uno32
+build_flags =
+	${common.build_flags}
+	-D WEMOS_D1_R32_RA02
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

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

@@ -0,0 +1,24 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          15
+    #define RADIO_MISO_PIN          13
+    #define RADIO_MOSI_PIN          12
+    #define RADIO_CS_PIN            14
+    #define RADIO_RST_PIN           2
+    #define RADIO_BUSY_PIN          25
+
+    //  Display    
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                5
+    #define OLED_SCL                4
+    #define OLED_RST                -1
+
+#endif

variants/WEMOS-LOLIN32-OLED-DIY/platformio.ini

@@ -0,0 +1,8 @@
+[env:WEMOS-LOLIN32-OLED-DIY]
+board = lolin32
+build_flags =
+	${common.build_flags}
+	-D WEMOS_LOLIN32_OLED_DIY_LoRa
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h

@@ -0,0 +1,16 @@
+#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           33
+    #define RADIO_BUSY_PIN          38
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        15
+
+#endif

variants/WEMOS_S2_MINI_DIY_LoRa/platformio.ini

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

variants/esp32c3_DIY_1W_LoRa/board_pinout.h

@@ -0,0 +1,17 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1268
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          8
+    #define RADIO_MISO_PIN          9
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           4
+    #define RADIO_DIO1_PIN          2
+    #define RADIO_BUSY_PIN          3
+    #define RADIO_RXEN              6
+    #define RADIO_TXEN              7
+
+#endif

variants/esp32c3_DIY_1W_LoRa/platformio.ini

@@ -0,0 +1,10 @@
+[env:esp32c3_DIY_1W_LoRa]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D ESP32C3_DIY_1W_LoRa
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h

@@ -0,0 +1,17 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          8
+    #define RADIO_MISO_PIN          9
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           4
+    #define RADIO_DIO1_PIN          2
+    #define RADIO_BUSY_PIN          3
+    #define RADIO_RXEN              6
+    #define RADIO_TXEN              7
+
+#endif

variants/esp32c3_DIY_1W_LoRa_915/platformio.ini

@@ -0,0 +1,10 @@
+[env:esp32c3_DIY_1W_LoRa_915]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D ESP32C3_DIY_1W_LoRa_915
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec-lora32-v2/board_pinout.h

@@ -0,0 +1,29 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #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
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                4
+    #define OLED_SCL                15
+    #define OLED_RST                16
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        25
+    #define BATTERY_PIN             37
+    #define ADC_CTRL                21
+    
+#endif

variants/heltec-lora32-v2/platformio.ini

@@ -0,0 +1,8 @@
+[env:heltec-lora32-v2]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D HELTEC_V2
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_ht-ct62/board_pinout.h

@@ -0,0 +1,17 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          10
+    #define RADIO_MISO_PIN          6
+    #define RADIO_MOSI_PIN          7
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           5
+    #define RADIO_DIO1_PIN          3
+    #define RADIO_BUSY_PIN          4
+
+    //  Aditional Config
+    #define BATTERY_PIN             1
+
+#endif

variants/heltec_ht-ct62/platformio.ini

@@ -0,0 +1,9 @@
+[env:heltec_ht-ct62]
+board = heltec_wireless_stick_lite
+board_build.mcu = esp32c3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_HTCT62
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wifi_lora_32_V3/board_pinout.h

@@ -0,0 +1,33 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                17
+    #define OLED_SCL                18
+    #define OLED_RST                21
+
+    //  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_wifi_lora_32_V3/platformio.ini

@@ -0,0 +1,9 @@
+[env:heltec_wifi_lora_32_V3]
+board = heltec_wifi_lora_32_V3
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_V3
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wireless_paper/board_pinout.h

@@ -0,0 +1,32 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_EPAPER
+    #define EPAPER_BUSY             7
+    #define EPAPER_RST              6
+    #define EPAPER_DC               5
+    #define EPAPER_CS               4
+    #define EPAPER_SCL              3
+    #define EPAPER_SDA              2
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        18
+    #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/platformio.ini

@@ -0,0 +1,8 @@
+[env:heltec_wireless_paper]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_WP
+lib_deps =
+	${common.lib_deps}

variants/heltec_wireless_stick/board_pinout.h

@@ -0,0 +1,33 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                4
+    #define OLED_SCL                15
+    #define OLED_RST                16
+
+    //  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/platformio.ini

@@ -0,0 +1,9 @@
+[env:heltec_wireless_stick]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_WS
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wireless_stick_lite_v3/board_pinout.h

@@ -0,0 +1,22 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  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/platformio.ini

@@ -0,0 +1,8 @@
+[env:heltec_wireless_stick_lite_v3]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_WSL_V3
+lib_deps =
+	${common.lib_deps}

variants/heltec_wireless_stick_lite_v3_display/board_pinout.h

@@ -0,0 +1,26 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  Display
+    #define HAS_DISPLAY
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  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/platformio.ini

@@ -0,0 +1,8 @@
+[env:heltec_wireless_stick_lite_v3_display]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_WSL_V3_DISPLAY
+lib_deps =
+	${common.lib_deps}

variants/heltec_wireless_tracker/board_pinout.h

@@ -0,0 +1,32 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9       // SX1262 SCK
+    #define RADIO_MISO_PIN          11      // SX1262 MISO
+    #define RADIO_MOSI_PIN          10      // SX1262 MOSI
+    #define RADIO_CS_PIN            8       // SX1262 NSS
+    #define RADIO_RST_PIN           12      // SX1262 RST
+    #define RADIO_DIO1_PIN          14      // SX1262 DIO1
+    #define RADIO_BUSY_PIN          13      // SX1262 BUSY
+    
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_TFT
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        18
+    #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
+    #define GPS_BAUDRATE            115200
+    #define GPS_RX                  34
+    #define GPS_TX                  33
+
+#endif

variants/heltec_wireless_tracker/platformio.ini

@@ -0,0 +1,32 @@
+[env:heltec_wireless_tracker]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D HELTEC_WIRELESS_TRACKER
+	-D USER_SETUP_LOADED
+	-D TFT_WIDTH=80
+	-D TFT_HEIGHT=160
+	-D ST7735_DRIVER
+	-D ST7735_GREENTAB160x80
+	-D TFT_RGB_ORDER=TFT_BGR
+	-D TFT_MOSI=42
+	-D TFT_SCLK=41
+	-D TFT_CS=38
+	-D TFT_DC=40
+	-D TFT_RST=39
+	-D TFT_BL=21
+	-D TFT_BACKLIGHT_ON=1
+	-D TOUCH_CS=-1
+	-D LOAD_GLCD
+	-D LOAD_FONT2
+	-D LOAD_FONT4
+	-D LOAD_FONT6
+	-D LOAD_FONT7
+	-D LOAD_FONT8
+	-D SPI_FREQUENCY=27000000
+	-D USE_HSPI_PORT
+lib_deps =
+	${common.lib_deps}
+	bodmer/TFT_eSPI @ 2.5.43

variants/ttgo-lora32-v21/board_pinout.h

@@ -0,0 +1,29 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #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
+
+    //  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        25      // Green Led
+    #define BATTERY_PIN             35   
+	#define HAS_ADC_CALIBRATION    
+
+#endif

variants/ttgo-lora32-v21/platformio.ini

@@ -0,0 +1,8 @@
+[env:ttgo-lora32-v21]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D TTGO_LORA32_V2_1
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/ttgo-lora32-v21_915/board_pinout.h

@@ -0,0 +1,29 @@
+#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
+
+    //  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        25      // Green Led
+    #define BATTERY_PIN             35
+    #define HAS_ADC_CALIBRATION
+    
+#endif

variants/ttgo-lora32-v21_915/platformio.ini

@@ -0,0 +1,8 @@
+[env:ttgo-lora32-v21_915]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D TTGO_LORA32_V2_1_915
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}