minor correction to EM activation

Correct logic of serial notifications for APRS-IS and RF beacons

.github/workflows/build.yml

@@ -11,16 +11,84 @@ jobs:
             fail-fast: false
             matrix:
                 target:
-                    - "ttgo-lora32-v21"
-                    - "heltec-lora32-v2"
-                    - "heltec_wifi_lora_32_V3"
-                    - "ESP32_DIY_LoRa"
-                    - "ESP32_DIY_1W_LoRa"
-                    - "ttgo-t-beam-v1_2"
-                    - "ttgo-t-beam-v1"
-                    - "ttgo-t-beam-v1_SX1268"
-                    - "ttgo-t-beam-v1_2_SX1262"
-                    # - "heltec_wireless_stick_lite" # NOT FULLY TESTED
+                    - name: ttgo-lora32-v21
+                      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
+                      chip: esp32s3
+                    - name: heltec_wifi_lora_32_V3_2
+                      chip: esp32s3
+                    - name: heltec_wireless_stick
+                      chip: esp32s3
+                    - name: heltec_wireless_stick_lite_v3
+                      chip: esp32s3
+                    - name: heltec_wireless_stick_lite_v3_display
+                      chip: esp32s3
+                    - name: ESP32_DIY_LoRa
+                      chip: esp32
+                    - name: ESP32_DIY_LoRa_915
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_915
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_LLCC68
+                      chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_Mesh_V1_2
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2_915
+                      chip: esp32
+                    - name: ttgo-t-beam-v1
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_915
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_SX1268
+                      chip: esp32
+                    - name: ttgo-t-beam-v1_2_SX1262
+                      chip: esp32
+                    - name: ttgo_t_deck_plus
+                      chip: esp32s3
+                    - name: ttgo_t_deck_GPS
+                      chip: esp32s3
+                    - name: ttgo_t_beam_s3_SUPREME_v3
+                      chip: esp32s3
+                    - name: ESP32_DIY_LoRa_A7670
+                      chip: esp32
+                    - name: ESP32_DIY_LoRa_A7670_915
+                      chip: esp32
+                    - name: heltec_wireless_tracker
+                      chip: esp32s3
+                    - name: heltec_ht-ct62
+                      chip: esp32c3
+                    - name: heltec_wireless_paper
+                      chip: esp32s3
+                    - name: OE5HWN_MeshCom
+                      chip: esp32
+                    - name: WEMOS-LOLIN32-OLED-DIY
+                      chip: esp32
+                    - name: WEMOS-D1-R32-RA02
+                      chip: esp32
+                    - name: WEMOS_S2_MINI_DIY_LoRa
+                      chip: esp32s2
+                    - name: esp32c3_DIY_1W_LoRa
+                      chip: esp32c3
+                    - name: esp32c3_DIY_1W_LoRa_915
+                      chip: esp32c3
+                    - name: ESP32_C3_OctopusLab_LoRa
+                      chip: esp32c3
+                    - name: QRPLabs_LightGateway_1_0
+                      chip: esp32s3
+                    - name: XIAO_ESP32S3_WIO_SX1262
+                      chip: esp32s3
+                    - name: TROY_LoRa_APRS
+                      chip: esp32                    
         steps:
             - uses: actions/checkout@v3
 
@@ -32,19 +100,70 @@ jobs:
               run: pip install --upgrade platformio
 
             - name: Build target
-              run: pio run -e ${{ matrix.target }}
+              run: |
+                  pio run -e ${{ matrix.target.name }} 
 
             - name: Build FS
-              run: pio run --target buildfs -e ${{ matrix.target }}
+              run: |
+                  pio run --target buildfs -e ${{ matrix.target.name }}
 
             - name: Move Files
               run: |
                   mkdir -p installer/firmware
-                  cp .pio/build/${{ matrix.target }}/firmware.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/bootloader.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/partitions.bin installer/firmware/
-                  cp .pio/build/${{ matrix.target }}/spiffs.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/firmware.bin installer/ota_update.bin
+                  cp .pio/build/${{ matrix.target.name }}/firmware.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/bootloader.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/partitions.bin installer/firmware/
+                  cp .pio/build/${{ matrix.target.name }}/spiffs.bin installer/firmware/
                   cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin installer/firmware/
+              
+            - name: Merge for web flashing
+              run: |
+                  if [ "${{ matrix.target.chip }}" == "esp32" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32s2" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32s2 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32s3" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32s3 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 8MB \
+                      0x0000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  elif [ "${{ matrix.target.chip }}" == "esp32c3" ]; then
+                    python installer/bin/esptool/esptool.py --chip esp32c3 merge_bin \
+                      -o installer/web_factory.bin \
+                      --flash_mode dio \
+                      --flash_freq 40m \
+                      --flash_size 4MB \
+                      0x1000 installer/firmware/bootloader.bin \
+                      0x8000 installer/firmware/partitions.bin \
+                      0xe000 installer/firmware/boot_app0.bin \
+                      0x10000 installer/firmware/firmware.bin \
+                      0x3D0000 installer/firmware/spiffs.bin
+                  fi
 
             - name: Install Zip
               run: sudo apt-get install zip
@@ -59,5 +178,5 @@ jobs:
               with:
                   upload_url: ${{ github.event.release.upload_url }}
                   asset_path: ./installer.zip
-                  asset_name: ${{ matrix.target }}.zip
+                  asset_name: ${{ matrix.target.name }}.zip
                   asset_content_type: application/zip

.github/workflows/commit.yml

@@ -0,0 +1,31 @@
+name: Commit Test Build
+
+on:
+    push:
+        branches:
+            - '*'
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+              target:
+                - name: ttgo-lora32-v21
+                  chip: esp32
+        steps:
+            - uses: actions/checkout@v3
+
+            - uses: actions/setup-python@v4
+              with:
+                  python-version: "3.9"
+
+            - name: Install PlatformIO Core
+              run: pip install --upgrade platformio
+
+            - name: Build target
+              run: pio run -e ${{ matrix.target.name }}
+
+            - name: Build FS
+              run: pio run --target buildfs -e ${{ matrix.target.name }}

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
     "editor.tabSize": 4,
-    "editor.formatOnSave": true
-}
+    "editor.formatOnSave": false
+}

README.md

@@ -1,80 +1,129 @@
-# Richonguzman / 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.
 
-![Screenshot](https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/images/OledScreen.jpeg)
+![Screenshot](https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/images/iGateOledScreen.jpeg)
 
-__(NOTE: This iGate Firmware was develop to work with all LoRa APRS Trackers and specially with this firmware <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker</a>)__
+__(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker Firmware</a>))__
+<br />
 
-___________________________________________________
+____________________________________________________
 
 ## You can support this project to continue to grow:
 
 [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/github-sponsors.png">](https://github.com/sponsors/richonguzman)     [<img src="https://github.com/richonguzman/LoRa_APRS_Tracker/blob/main/images/paypalme.png">](http://paypal.me/richonguzman)
 
-____________________________________________________
+<br />
 
-This next generation LoRa iGate can work as:
-- pure RX-iGate, 
-- Rx+Tx-iGate and distribute messages and weather forecasts to heard trackers, and 
-- Digipeater in simplex or split-frequency environment.
-
-In all configurations the display shows the current stationMode, heard packets and events the iGate is currently performing.
-
-But under the hood is much more:
-
-- Web Configuration UI.
-- Sending events to remote syslog server.
-- OTA update capability (for Firmware and Filesystem).
-- RX first, TX will only be done if there is no traffic on the frequency.
-- automatic update of the Lora symbol at APRS-IS, black "L" for pure RX, red "L" for TX capability, green star "L" for digipeater and blue round "L" for WX iGate.
-- support for multiple WLAN with corresponding coordinates.
-- support for BME/BMP280 and BME680 sensors, sending to WX data to APRS-IS.
-
-and more will come:
-- More Web UI Station Information
+# WEB FLASHER/INSTALLER is <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">here</a>
 
 ____________________________________________________
 
 # WIKI
 
-### 1. Installation Guide --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/1.-Installation-Guide" target="_blank">here</a>.
+### FAQ, BME280, TNC and more --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/00.-FAQ-(frequently-asked-questions)" target="_blank">here</a>.
 
-### 2. iGate Configuration and Explanation for each setting --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/2.-iGate-Configuration" target="_blank">here</a>.
+### Installation Guide --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/01.-Installation-Guide" target="_blank">here</a>.
+<br />
 
-### 3. Supported Boards and Environment Selection --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/3.-Supported-Boards-and-Environment-Selection" target="_blank">here</a>.
+# SUPPORTED BOARDS
 
-### 4. Upload Firmware and Filesystem --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/4.-Upload-Firmware-and-Filesystem" target="_blank">here</a>.
+### Buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/108.-Supported-Boards-and-Buying-Links" target="_blank">here</a>.
 
-### 5. Adding BME280 Module --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/5.-Adding-BME280-Module" target="_blank">here</a>.
+(NOTE: all boards with 433-868-915 MHz versions)
+
+- TTGO Lilygo LoRa32 T3S3 V1.2 and LoRa32 V2.1 (V1.6 is the same).
+
+- TTGO T-Beam V1.0 , V1.1, V1.2 (also variations with SX1262 and SX1268 LoRa Modules).
+
+- T-Deck Plus (and also regular T-Deck with/without GPS).
+
+- 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.
+
+- ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version.
+
+- ESP32 + 4G/LTE A7670 Modem + SX1278 DIY Version.
+
+- Wemos Lolin32 Oled + SX1278 DIY Version.
+
+<br />
 
-____________________________________________________
 ## Timeline (Versions):
 
+- 2025.03.03 T-Beam Supreme board added and more BlackList rules added.
+- 2025.02.28 Heltec Wireless Paper with Epaper working. Thanks SzymonPriv for pointing to the right library.
+- 2025.02.25 Objects Rules update, GPS Boards: Satellites on Screen, Wx Height Correction from GPS Data.
+- 2025.01.22 Added LILYGO T-DECK PLUS (and DIY+GPS version) board support.
+- 2025.01.11 Added HELTEC V3.2 board support.
+- 2025.01.07 TROY_LoRa_APRS board added. GMT in quarter hour fix and Beacon fix for TNC.
+- 2025.01.02 Callsign Black List added.
+- 2024.12.30 Fixed missing validation for correct Digipeater mode when not connected to APRS-IS.
+- 2024.12.06 APRS-IS connnection and passcode validation 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 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 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.
+- 2024.06.21 Tx packets coming from APRS-IS are (now) formatted into 3rd Party (as they should have been since the beginning). Thanks Lynn KJ4ERJ and Geoffrey F4FXL.
+- 2024.06.18 All boards with 433 / 868 / 915 MHz versions.
+- 2024.06.10 ESP32C3 + 1W LoRa Module (E22 400M30S) support added.
+- 2024.06.09 Si7021 module added (with autodetected I2C Address)
+- 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-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).
+- 2024.05.13 PacketBuffer for Rx (25 Seg).
+- 2024.05.11 HELTEC Wireless Tracker support added.
+- 2024.04.23 T-LoRa32 v1.6/v2.1 with 915MHz support added.
+- 2024.04.23 ESP32 + 4G/LTE MODEM A7670SA + LoRa (SX1278) support added.
+- 2024.04.22 Wemos Lolin32 OLED DIY LoRa support added .
+- 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/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 Added support for Lilygo TTGO T-Beam V1, V1.2, V1 + SX1268, V1.2 + SX1262.
-- 2024.01.02 Added support for EByte 400M30S 1Watt LoRa module for DIY ESP32 iGate.
+- 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.
 - 2023.12.27 HELTEC V3 board support added. Thanks Luc ON2ON.
-- 2023.12.26 Added BME680 module to BME/BMP280 modules supported.
-- 2023.12.07 MIC-E process and syslog added.
+- 2023.12.26 BME680 module support added.
+- 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 Support also for BMP280 module.
+- 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 Support for BME280 Module (Temperature, Humidity, Pressure) added.
+- 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.
@@ -83,54 +132,6 @@ ____________________________________________________
 - 2023.02.17 Receiving Feed from APRS-IS.
 - 2023.02.10 First Beta (receiving LoRa Beacon/Packets and uploading to APRS-IS).
 
-____________________________________________________
-
-
-Instructions (add your information into the '/data/igate_conf.json'):
-
-a) Change _callsign_ from "NOCALL-10" to your CALLSIGN + SSID.
-
-b) Choose _stationMode_:
-
-    1 = RX iGate, black "L" as symbol
-
-    2 = Rx + TX iGate, red "L" as symbol, HAM only. RX will be sent to APRS-IS, Messages will be sent via Lora. Same frequency for RX and TX. By using this feature you have comply with the regulations of your country.
-
-    3 = Digipeater simplex, green "L" as symbol, HAM only. Received packets containing WIDEx-x in path will be digipeated on the same frequency. By using this feature you have comply with the regulations of your country.
-
-    4 = Digipeater split frequency, green "L" as symbol, HAM only. Received packets will be digipeated on a different frequency. Frequency separation must be 125kHz or more. By using this feature you have comply with the regulations of your country.
-
-    IgateComment and DigirepeaterComment will be sent to APRS-IS or via RF, depending on your stationmode
-
-c) WiFi section: 
-
-    adjust SSID and Password to you WiFi, add the GPS to "Latitude" and "Longitude" (info from GoogleMaps) of your new LoRa iGate. (If stationMode 3 or 4 selected, add also GPS info to Digirepeater Section).
-
-d) APRS_IS section: 
-
-    change "passcode" from "VWXYZ" to yours (remember that is 5 digits integer) and choose a server close to your location (see https://www.aprs2.net/)
-
-e) LORA section:
-
-    adjust TX frequency and RX frequency matching your stationmode and country. Remember,
-
-        at stationmode 1, 2, and 3, RX and TX frequency shall be set to 433775000 (443.775MHz, deviations possible, depending on your country) 
-
-        at stationmode 4, RX frequency shall be set to 433775000, TX frequency shall be set to 433900000 (deviations possible, depending on your country). There must be a frequency separation of 125kHz or more. 
-    
-    adjust power to your need, valid values are from 1 to 20
-
-f) Syslog section:
-    
-    adjust server and port to a suitable value if needed.
-
-g) BME section:
-
-    adjust to "active" if BME280 sensor connected through I2C pins
-
-
 __________________________________________
 
-Special Thanks to the help in testing and developing to Manfred (DC2MH) , for showing me the "way of good coding" to Tihomir (CA3TSK) and much more Ham Licence Ops all over the world.
-
-# 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 @ 7.1.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

@@ -1,71 +1,101 @@
 {
     "callsign": "NOCALL-10",
-    "stationMode": 2,
-    "iGateComment": "LoRa_APRS_iGate",
     "wifi": {
         "autoAP": {
             "password": "1234567890",
-            "powerOff": 10
+            "timeout": 10
         },
-        "AP": [
-            {
-                "ssid": "WIFI_1",
-                "password": "WIFI_1_password",
-                "latitude": 0.0,
-                "longitude": 0.0
-            },
-            {
-                "ssid": "WIFI_2",
-                "password": "WIFI_2_password",
-                "latitude": 0.0,
-                "longitude": 0.0
-            }
-        ]
+        "AP": []
     },
-    "digi": {
-        "comment": "LoRa_APRS_Digirepeater",
+    "beacon": {
         "latitude": 0.0,
-        "longitude": 0.0
+        "longitude": 0.0,
+        "comment": "LoRa APRS",
+        "interval": 15,
+        "overlay": "L",
+        "symbol": "a",
+        "path": "WIDE1-1",
+        "sendViaAPRSIS": false,
+        "sendViaRF": false
     },
     "aprs_is": {
+        "active": false,
         "passcode": "XYZVW",
         "server": "rotate.aprs2.net",
         "port": 14580,
-        "reportingDistance": 30
+        "filter": "m/10",
+        "messagesToRF": false,
+        "objectsToRF": false
+    },
+    "digi": {
+        "mode": 0,
+        "ecoMode": false
     },
     "lora": {
-        "iGateFreq": 433775000,
-        "digirepeaterTxFreq": 433775000,
-        "digirepeaterRxFreq": 433900000,
+        "txFreq": 433775000,
+        "rxFreq": 433775000,
         "spreadingFactor": 12,
         "signalBandwidth": 125000,
         "codingRate4": 5,
-        "power": 20
+        "power": 20,
+        "txActive": false,
+        "rxActive": true
     },
     "display": {
         "alwaysOn": true,
         "timeout": 4,
         "turn180": false
     },
+    "battery": {
+        "sendInternalVoltage": false,
+        "monitorInternalVoltage": false,
+        "internalSleepVoltage": 2.9,
+        "sendExternalVoltage": false,
+        "externalVoltagePin": 34,
+        "monitorExternalVoltage": false,
+        "externalSleepVoltage": 10.9,
+        "voltageDividerR1": 100.0,
+        "voltageDividerR2": 27.0,
+        "sendVoltageAsTelemetry": false
+	},
+    "wxsensor": {
+        "active": false,
+        "heightCorrection": 0,
+        "temperatureCorrection": 0.0
+	},
     "syslog": {
         "active": false,
-        "server": "192.168.0.100",
-        "port": 514
+        "server": "lora.link9.net",
+        "port": 1514
     },
-    "bme": {
-        "active": false
+    "tnc": {
+        "enableServer": false,
+        "enableSerial": false,
+        "acceptOwn": false
     },
     "ota": {
         "username": "",
         "password": ""
     },
+    "webadmin": {
+        "username": "admin",
+        "password": ""
+    },
+    "ntp": {
+        "gmtCorrection": 0.0
+    },
+    "remoteManagement": {
+        "managers": "",
+        "rfOnly": true
+    },        
     "other": {
-        "beaconInterval": 15,
-        "igateSendsLoRaBeacons": false,
-        "igateRepeatsLoRaPackets": false,
         "rememberStationTime": 30,
-        "sendBatteryVoltage": false,
-        "externalVoltageMeasurement": false,
-        "externalVoltagePin": 34
-    }
-}
+        "lowPowerMode": false,
+        "lowVoltageCutOff": 0,
+        "backupDigiMode": false,
+        "rebootMode": false,
+        "rebootModeTime": 6
+    },
+    "personalNote": "",
+    "blacklist": ""
+}

data_embed/script.js

@@ -74,15 +74,18 @@ logCheckbox.addEventListener("change", function () {
 function loadSettings(settings) {
     currentSettings = settings;
     // General
-    document.getElementById("callsign").value = settings.callsign;
-    document.getElementById("stationMode").value = settings.stationMode;
-    document.getElementById("bme.active").checked = settings.bme.active;
-    document.getElementById("iGateComment").value = settings.iGateComment;
+    document.getElementById("callsign").value                           = settings.callsign;
+    document.getElementById("beacon.comment").value                     = settings.beacon.comment;
+    document.getElementById("beacon.path").value                        = settings.beacon.path;
+    document.getElementById("beacon.symbol").value                      = settings.beacon.symbol;
+    document.getElementById("beacon.overlay").value                     = settings.beacon.overlay;
+    document.getElementById("personalNote").value                       = settings.personalNote;
+    document.getElementById("action.symbol").value                      = settings.beacon.overlay + settings.beacon.symbol;
 
-    document.querySelector(".list-networks").innerHTML = "";
+    document.querySelector(".list-networks").innerHTML                  = "";
 
     // Networks
-    const wifiNetworks = settings.wifi.AP;
+    const wifiNetworks = settings.wifi.AP || [];
     const networksContainer = document.querySelector(".list-networks");
 
     let networkCount = 0;
@@ -94,23 +97,15 @@ function loadSettings(settings) {
         // Increment the name, id, and for attributes
         const attributeName = `wifi.AP.${networkCount}`;
         networkElement.innerHTML = `
-                  <div class="form-floating col-6 col-md-3 px-1 mb-2">
+                  <div class="form-floating col-5 px-1 mb-2">
                     <input type="text" class="form-control form-control-sm" name="${attributeName}.ssid" id="${attributeName}.ssid" value="${network.ssid}">
                     <label for="${attributeName}.ssid">SSID</label>
                   </div>
-                  <div class="form-floating col-6 col-md-3 px-1 mb-2">
-                    <input type="text" class="form-control form-control-sm" name="${attributeName}.password" id="${attributeName}.password" value="${network.password}">
+                  <div class="form-floating col-5 px-1 mb-2">
+                    <input type="password" class="form-control form-control-sm" name="${attributeName}.password" id="${attributeName}.password" value="${network.password}">
                     <label for="${attributeName}.password">Passphrase</label>
                   </div>
-                  <div class="col-4 col-md-2 form-floating px-1 mb-2">
-                    <input type="text" class="form-control form-control-sm latitude" name="${attributeName}.latitude" id="${attributeName}.latitude" value="${network.latitude}">
-                    <label for="${attributeName}.latitude">Latitude</label>
-                  </div>
-                  <div class="col-4 col-md-2 form-floating px-1 mb-2">
-                    <input type="text" class="form-control form-control-sm longitude" name="${attributeName}.longitude" id="${attributeName}.longitude" value="${network.longitude}">
-                    <label for="${attributeName}.longitude">Longitude</label>
-                  </div>
-                  <div class="col-4 col-md-2 d-flex align-items-center justify-content-end">
+                  <div class="col-2 d-flex align-items-center justify-content-end">
                     <div class="btn-group" role="group">
                       <button type="button" class="btn btn-sm btn-danger" title="Delete" onclick="return this.parentNode.parentNode.parentNode.remove();"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash3-fill" viewBox="0 0 16 16">
               <path d="M11 1.5v1h3.5a.5.5 0 0 1 0 1h-.538l-.853 10.66A2 2 0 0 1 11.115 16h-6.23a2 2 0 0 1-1.994-1.84L2.038 3.5H1.5a.5.5 0 0 1 0-1H5v-1A1.5 1.5 0 0 1 6.5 0h3A1.5 1.5 0 0 1 11 1.5m-5 0v1h4v-1a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5M4.5 5.029l.5 8.5a.5.5 0 1 0 .998-.06l-.5-8.5a.5.5 0 1 0-.998.06m6.53-.528a.5.5 0 0 0-.528.47l-.5 8.5a.5.5 0 0 0 .998.058l.5-8.5a.5.5 0 0 0-.47-.528M8 4.5a.5.5 0 0 0-.5.5v8.5a.5.5 0 0 0 1 0V5a.5.5 0 0 0-.5-.5"/>
@@ -123,170 +118,233 @@ function loadSettings(settings) {
     });
 
     // APRS-IS
-    document.getElementById("aprs_is.server").value = settings.aprs_is.server;
-    document.getElementById("aprs_is.port").value = settings.aprs_is.port;
-    document.getElementById("aprs_is.reportingDistance").value =
-        settings.aprs_is.reportingDistance;
-    document.getElementById("aprs_is.passcode").value =
-        settings.aprs_is.passcode;
+    document.getElementById("aprs_is.active").checked                   = settings.aprs_is.active;
+    document.getElementById("aprs_is.messagesToRF").checked             = settings.aprs_is.messagesToRF;
+    document.getElementById("aprs_is.objectsToRF").checked              = settings.aprs_is.objectsToRF;
+    document.getElementById("aprs_is.server").value                     = settings.aprs_is.server;
+    document.getElementById("aprs_is.port").value                       = settings.aprs_is.port;
+    document.getElementById("aprs_is.filter").value                     = settings.aprs_is.filter;
+    document.getElementById("aprs_is.passcode").value                   = settings.aprs_is.passcode;
+
+    // Beacon
+    document.getElementById("beacon.latitude").value                    = settings.beacon.latitude;
+    document.getElementById("beacon.longitude").value                   = settings.beacon.longitude;
+    document.getElementById("beacon.interval").value                    = settings.beacon.interval;
+    document.getElementById("other.rememberStationTime").value          = settings.other.rememberStationTime;   
+    document.getElementById("beacon.sendViaAPRSIS").checked             = settings.beacon.sendViaAPRSIS;
+    document.getElementById("beacon.sendViaRF").checked                 = settings.beacon.sendViaRF;
+
+    document.getElementById("beacon.gpsActive").checked                 = settings.beacon.gpsActive;
+    document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;
+
+    // Black List
+    document.getElementById("blacklist").value                          = settings.blacklist;
+
+    // Digi
+    document.getElementById("digi.mode").value                          = settings.digi.mode;
+    document.getElementById("digi.ecoMode").checked                     = settings.digi.ecoMode;
+
+    // LoRa
+    document.getElementById("lora.txFreq").value                        = settings.lora.txFreq;
+    document.getElementById("lora.rxFreq").value                        = settings.lora.rxFreq;
+    document.getElementById("lora.txActive").checked                    = settings.lora.txActive;
+    document.getElementById("lora.rxActive").checked                    = settings.lora.rxActive;
+    document.getElementById("lora.spreadingFactor").value               = settings.lora.spreadingFactor;
+    document.getElementById("lora.signalBandwidth").value               = settings.lora.signalBandwidth;
+    document.getElementById("lora.codingRate4").value                   = settings.lora.codingRate4;
+    document.getElementById("lora.power").value                         = settings.lora.power;
 
     // Display
-    document.getElementById("display.alwaysOn").checked =
-        settings.display.alwaysOn;
-    document.getElementById("display.turn180").checked =
-        settings.display.turn180;
-    document.getElementById("display.timeout").value = settings.display.timeout;
+    document.getElementById("display.alwaysOn").checked                 = settings.display.alwaysOn;
+    document.getElementById("display.turn180").checked                  = settings.display.turn180;
+    document.getElementById("display.timeout").value                    = settings.display.timeout;
 
     if (settings.display.alwaysOn) {
         timeoutInput.disabled = true;
     }
 
-    // WiFi Auto AP
-    document.getElementById("wifi.autoAP.password").value =
-        settings.wifi.autoAP.password;
-    document.getElementById("wifi.autoAP.powerOff").value =
-        settings.wifi.autoAP.powerOff;
-
-    // Digi
-    document.getElementById("digi.comment").value = settings.digi.comment;
-    document.getElementById("digi.latitude").value = settings.digi.latitude;
-    document.getElementById("digi.longitude").value = settings.digi.longitude;
-
-    // OTA
-    document.getElementById("ota.username").value = settings.ota.username;
-    document.getElementById("ota.password").value = settings.ota.password;
-
-    // Beacon
-    document.getElementById("other.beaconInterval").value =
-        settings.other.beaconInterval;
-    document.getElementById("other.rememberStationTime").value =
-        settings.other.rememberStationTime;
-    document.getElementById("other.sendBatteryVoltage").checked =
-        settings.other.sendBatteryVoltage;
-    document.getElementById("other.externalVoltageMeasurement").checked =
-        settings.other.externalVoltageMeasurement;
-    document.getElementById("other.externalVoltagePin").value =
-        settings.other.externalVoltagePin;
-    document.getElementById("other.igateSendsLoRaBeacon").value =
-        settings.other.igateSendsLoRaBeacon;
-    document.getElementById("other.igateRepeatLoRaPackets").value =
-        settings.other.igateRepeatLoRaPackets;
-
-    // Syslog
-    document.getElementById("syslog.active").checked = settings.syslog.active;
-    document.getElementById("syslog.server").value = settings.syslog.server;
-    document.getElementById("syslog.port").value = settings.syslog.port;
+    // BATTERY
+    document.getElementById("battery.sendInternalVoltage").checked      = settings.battery.sendInternalVoltage;
+    document.getElementById("battery.monitorInternalVoltage").checked   = settings.battery.monitorInternalVoltage;
+    document.getElementById("battery.internalSleepVoltage").value       = settings.battery.internalSleepVoltage.toFixed(1);
+    document.getElementById("battery.sendExternalVoltage").checked      = settings.battery.sendExternalVoltage;
+    document.getElementById("battery.externalVoltagePin").value         = settings.battery.externalVoltagePin;
+    document.getElementById("battery.voltageDividerR1").value           = settings.battery.voltageDividerR1.toFixed(1);
+    document.getElementById("battery.voltageDividerR2").value           = settings.battery.voltageDividerR2.toFixed(1);
+    document.getElementById("battery.monitorExternalVoltage").checked   = settings.battery.monitorExternalVoltage;
+    document.getElementById("battery.externalSleepVoltage").value       = settings.battery.externalSleepVoltage.toFixed(1);
+    document.getElementById("battery.sendVoltageAsTelemetry").checked   = settings.battery.sendVoltageAsTelemetry;
+    
+    // TELEMETRY WX SENSOR
+    document.getElementById("wxsensor.active").checked                  = settings.wxsensor.active;
+    document.getElementById("wxsensor.heightCorrection").value          = settings.wxsensor.heightCorrection;
+    document.getElementById("wxsensor.temperatureCorrection").value     = settings.wxsensor.temperatureCorrection.toFixed(1);
+    
+    // SYSLOG
+    document.getElementById("syslog.active").checked                    = settings.syslog.active;
+    document.getElementById("syslog.server").value                      = settings.syslog.server;
+    document.getElementById("syslog.port").value                        = settings.syslog.port;
 
     if (settings.syslog.active) {
         serverField.disabled = false;
         portField.disabled = false;
     }
 
-    // LoRa
-    document.getElementById("lora.digirepeaterTxFreq").value =
-        settings.lora.digirepeaterTxFreq;
-    document.getElementById("lora.iGateFreq").value = settings.lora.iGateFreq;
-    document.getElementById("lora.digirepeaterRxFreq").value =
-        settings.lora.digirepeaterRxFreq;
-    document.getElementById("lora.spreadingFactor").value =
-        settings.lora.spreadingFactor;
-    document.getElementById("lora.signalBandwidth").value =
-        settings.lora.signalBandwidth;
-    document.getElementById("lora.codingRate4").value =
-        settings.lora.codingRate4;
-    document.getElementById("lora.power").value = settings.lora.power;
+    // TNC
+    if (settings.tnc) {
+        document.getElementById("tnc.enableServer").checked             = settings.tnc.enableServer;
+        document.getElementById("tnc.enableSerial").checked             = settings.tnc.enableSerial;
+        document.getElementById("tnc.acceptOwn").checked                = settings.tnc.acceptOwn;
+    }
+
+    // Reboot
+    document.getElementById("other.rebootMode").checked                 = settings.other.rebootMode;
+    document.getElementById("other.rebootModeTime").value               = settings.other.rebootModeTime;
+
+    // WiFi Auto AP
+    document.getElementById("wifi.autoAP.password").value               = settings.wifi.autoAP.password;
+    document.getElementById("wifi.autoAP.timeout").value                = settings.wifi.autoAP.timeout;
+
+    // OTA
+    document.getElementById("ota.username").value                       = settings.ota.username;
+    document.getElementById("ota.password").value                       = settings.ota.password;
+
+    // Webadmin
+    document.getElementById("webadmin.active").checked                  = settings.webadmin.active;
+    document.getElementById("webadmin.username").value                  = settings.webadmin.username;
+    document.getElementById("webadmin.password").value                  = settings.webadmin.password;
+
+    // NTP
+    document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
+
+    // Experimental
+    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
+
+    document.getElementById("other.lowPowerMode").checked               = settings.other.lowPowerMode;
+    document.getElementById("other.lowVoltageCutOff").value             = settings.other.lowVoltageCutOff || 0
+
+    // Management over APRS
+    document.getElementById("remoteManagement.managers").value          = settings.remoteManagement.managers;
+    document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
 
     updateImage();
+    refreshSpeedStandard();
+    toggleFields();
 }
 
-const bmeCheckbox = document.querySelector("input[name='bme.active']");
+function showToast(message) {
+    const el = document.querySelector('#toast');
 
-const stationModeSelect = document.querySelector("select[name='stationMode']");
+    el.querySelector('.toast-body').innerHTML = message;
 
-const digirepeaterTxFreqInput = document.querySelector(
-    "input[name='lora.digirepeaterRxFreq']"
-);
+    (new bootstrap.Toast(el)).show();
+}
+
+document.getElementById('send-beacon').addEventListener('click', function (e) {
+    e.preventDefault();
+
+    fetch("/action?type=send-beacon", { method: "POST" });
+
+    showToast("Your beacon will be sent in a moment. <br> <u>This action will be ignored if you have APRSIS and LoRa TX disabled!</u>");
+});
+
+document.getElementById('reboot').addEventListener('click', function (e) {
+    e.preventDefault();
+
+    fetch("/action?type=reboot", { method: "POST" });
+
+    showToast("Your device will be rebooted in a while");
+});
+
+const wxsensorCheckbox = document.querySelector("input[name='wxsensor.active']");
 
 function updateImage() {
+    const value = document.getElementById("beacon.overlay").value + document.getElementById("beacon.symbol").value;
+
     const image = document.querySelector("img");
 
-    const isChecked = bmeCheckbox.checked;
-
-    if (isChecked) {
-        image.src =
-            "data:image/png;base64,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";
-    } else {
-        const selectedValue = stationModeSelect.value;
-
-        if (selectedValue === "1") {
-            if (bmeCheckbox.checked) {
-                image.src =
-                    "data:image/png;base64,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";
-            } else {
-                image.src =
-                    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAYAAAA5ZDbSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ6SURBVHgB7d0/axRBGMfx50IMWPoKkpA02gUsLfZdqOCLOPBFWAliHbCUVNpaxQNrIY0WVjZaJlUsIsZ5uDu9bGb/zMwzs/PM/L7wIG4Ocflwl7ndvVsihBBCmTajunpk5uHG33+aOSGkvhdmLs1cW+bKzDEhle2a+UZ22Pacrx6PlMRYXc/arrkkIKvIBxfISgrBBXLmSeACOdMkcYGcWTFwgZxJMXGBPHEpcIE8USlxgSzcbGD2KD0ukIXKGRfIAuWOC+TANOACOSAtuEAemQ10a2P2KV9cIA+0ZZltMzurOaT8cYHcUx+wJlwgd9QFrBEXyJZswAekFxfIrdq4GhZUQO7Itlq+QzoXVEC21AdcIm51yF3AJeNWhWwDLmFBBeRVmg4/Atmj2nGLR/bCbZrm2qWx/+7Ekwx5i9LGO/XFzF2qO97/r5QAOSUwcG+WBDkVMHDtRUdOAcz/ed4J4NqLihwbGLjjioYcExi4bkVBjgUMXL/EkWMAAzcsUWRpYODKJIYsCQxc2USQpYCBG6dgZAlg4MYtCDkUGLhp8kYOAQZu2ryQfYGT4S7PAKJVzsg+wEmfubNZbd+XOpgTsiswXpbzaDSyCzBw82oU8lhg4ObZIPIYYODmXS/yEDBwdcQ+72w/6AMGrq6OaHnLghv1AQNXX6/bG7qAPxNwNbbf3mAD5qf5EaEisgG/IVRMNuA9QsVkA94mpLWP7Q2pP5uE4vayvQHA5bQw86m90Qb8i5C22Kyx/cAG/IGQphj3ftcPbcBzM78JaWiN+73rATZgfvAzWn4SHeXbIC7Xtcg6MfOUgJxro3C5vlU0kPNsNC439DYJyHnlhMuNeR8M5DxyxuXGHugA8rR54XIuR7KAPE3euJzroUogpy0Il/M5Fg3kNAXjcr4nG4AcNxFcLuTc78nqz7e0/A7KLDo9PbV+nkn6Q2xnZ2c0n88pQmK4XOjJ/eyQm6YhxYnichLng/FyLZM4Lid1wh/IYUXB5SSv6ACyX9FwOelLdoDsVlRcLsY1WUAeV3RcLtZFd0Duj3EfUGRcLuZVlUC2lwyXi32Re/D75IuLC1osFtYDFXxAo73dts21MV/8wgc6PEqKm7LHZv5QnndASTV8p5U9unl7oaJ6QvUi23CLA+YdqhGZcQ/Jfmu/olrvVE3Ia9wdqgB4sxp+JzPuPv2/+XV1lYzcxq32Q34lvlzbcKsF5h0vCZlxD+g2btXApSCvF1TbBOB/ba4oNSOvn7lr3KpWzC5pXHgVf4RKOk3P5CqOUEmn5eW6CxfAA2n4ndyHC+AR5YwMXOFyWngx7i4h8XJABm7kpkQGbqKmQAZu4lIiA3eiUiADd+JiIgM3k2IgAzezJJGBm2kSyMDNvBBk4CrJBxm4ynJB/kHAVRnf3OucumGvzBxTBZV+eouhn5u5t7HtvZlXhBBCCCEUsb+qGDWF0d8l5AAAAABJRU5ErkJggg==";
-            }
-            digirepeaterTxFreqInput.disabled = true;
-        } else if (selectedValue === "2") {
-            if (bmeCheckbox.checked) {
-                image.src =
-                    "data:image/png;base64,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";
-            } else {
-                image.src =
-                    "data:image/png;base64,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";
-            }
-            digirepeaterTxFreqInput.disabled = true;
-        } else if (selectedValue === "3" || selectedValue === "4") {
+    switch (value) {
+        case "L&":
+            image.src =
+                "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAYAAAA5ZDbSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAQ6SURBVHgB7d0/axRBGMfx50IMWPoKkpA02gUsLfZdqOCLOPBFWAliHbCUVNpaxQNrIY0WVjZaJlUsIsZ5uDu9bGb/zMwzs/PM/L7wIG4Ocflwl7ndvVsihBBCmTajunpk5uHG33+aOSGkvhdmLs1cW+bKzDEhle2a+UZ22Pacrx6PlMRYXc/arrkkIKvIBxfISgrBBXLmSeACOdMkcYGcWTFwgZxJMXGBPHEpcIE8USlxgSzcbGD2KD0ukIXKGRfIAuWOC+TANOACOSAtuEAemQ10a2P2KV9cIA+0ZZltMzurOaT8cYHcUx+wJlwgd9QFrBEXyJZswAekFxfIrdq4GhZUQO7Itlq+QzoXVEC21AdcIm51yF3AJeNWhWwDLmFBBeRVmg4/Atmj2nGLR/bCbZrm2qWx/+7Ekwx5i9LGO/XFzF2qO97/r5QAOSUwcG+WBDkVMHDtRUdOAcz/ed4J4NqLihwbGLjjioYcExi4bkVBjgUMXL/EkWMAAzcsUWRpYODKJIYsCQxc2USQpYCBG6dgZAlg4MYtCDkUGLhp8kYOAQZu2ryQfYGT4S7PAKJVzsg+wEmfubNZbd+XOpgTsiswXpbzaDSyCzBw82oU8lhg4ObZIPIYYODmXS/yEDBwdcQ+72w/6AMGrq6OaHnLghv1AQNXX6/bG7qAPxNwNbbf3mAD5qf5EaEisgG/IVRMNuA9QsVkA94mpLWP7Q2pP5uE4vayvQHA5bQw86m90Qb8i5C22Kyx/cAG/IGQphj3ftcPbcBzM78JaWiN+73rATZgfvAzWn4SHeXbIC7Xtcg6MfOUgJxro3C5vlU0kPNsNC439DYJyHnlhMuNeR8M5DxyxuXGHugA8rR54XIuR7KAPE3euJzroUogpy0Il/M5Fg3kNAXjcr4nG4AcNxFcLuTc78nqz7e0/A7KLDo9PbV+nkn6Q2xnZ2c0n88pQmK4XOjJ/eyQm6YhxYnichLng/FyLZM4Lid1wh/IYUXB5SSv6ACyX9FwOelLdoDsVlRcLsY1WUAeV3RcLtZFd0Duj3EfUGRcLuZVlUC2lwyXi32Re/D75IuLC1osFtYDFXxAo73dts21MV/8wgc6PEqKm7LHZv5QnndASTV8p5U9unl7oaJ6QvUi23CLA+YdqhGZcQ/Jfmu/olrvVE3Ia9wdqgB4sxp+JzPuPv2/+XV1lYzcxq32Q34lvlzbcKsF5h0vCZlxD+g2btXApSCvF1TbBOB/ba4oNSOvn7lr3KpWzC5pXHgVf4RKOk3P5CqOUEmn5eW6CxfAA2n4ndyHC+AR5YwMXOFyWngx7i4h8XJABm7kpkQGbqKmQAZu4lIiA3eiUiADd+JiIgM3k2IgAzezJJGBm2kSyMDNvBBk4CrJBxm4ynJB/kHAVRnf3OucumGvzBxTBZV+eouhn5u5t7HtvZlXhBBCCCEUsb+qGDWF0d8l5AAAAABJRU5ErkJggg==";
+            break;
+        case "L#":
             image.src =
                 "data:image/png;base64,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";
-            digirepeaterTxFreqInput.disabled = selectedValue === "3";
-        } else if (selectedValue === "5") {
-            if (bmeCheckbox.checked) {
-                image.src =
-                    "data:image/png;base64,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";
-            } else {
-                image.src =
-                    "data:image/png;base64,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";
-            }
-            digirepeaterTxFreqInput.disabled = true;
-        }
+            break;
+        case "L_":
+            image.src =
+                "data:image/png;base64,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";
+            break;
+        case "La":
+            image.src =
+                "data:image/png;base64,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";
+            break;
     }
 }
 
-stationModeSelect.addEventListener("change", updateImage);
-bmeCheckbox.addEventListener("change", updateImage);
-
 function toggleFields() {
-    const sendBatteryVoltageCheckbox = document.querySelector(
-        'input[name="other.sendBatteryVoltage"]'
-    );
-    const externalVoltageMeasurementCheckbox = document.querySelector(
-        'input[name="other.externalVoltageMeasurement"]'
+    const sendExternalVoltageCheckbox = document.querySelector(
+        'input[name="battery.sendExternalVoltage"]'
     );
     const externalVoltagePinInput = document.querySelector(
-        'input[name="other.externalVoltagePin"]'
+        'input[name="battery.externalVoltagePin"]'
     );
 
-    externalVoltageMeasurementCheckbox.disabled =
-        !sendBatteryVoltageCheckbox.checked;
-    externalVoltagePinInput.disabled =
-        !externalVoltageMeasurementCheckbox.checked;
+    externalVoltagePinInput.disabled = !sendExternalVoltageCheckbox.checked;
+    voltageDividerR1.disabled = !sendExternalVoltageCheckbox.checked;
+    voltageDividerR2.disabled = !sendExternalVoltageCheckbox.checked;
+
+    const WebadminCheckbox = document.querySelector(
+        'input[name="webadmin.active"]'
+    );
+
+    const WebadminUsername = document.querySelector(
+        'input[name="webadmin.username"]'
+    );
+
+    const WebadminPassword = document.querySelector(
+        'input[name="webadmin.password"]'
+    );
+    WebadminUsername.disabled = !WebadminCheckbox.checked;
+    WebadminPassword.disabled = !WebadminCheckbox.checked;
 }
 
-const sendBatteryVoltageCheckbox = document.querySelector(
-    'input[name="other.sendBatteryVoltage"]'
-);
-const externalVoltageMeasurementCheckbox = document.querySelector(
-    'input[name="other.externalVoltageMeasurement"]'
+const sendExternalVoltageCheckbox = document.querySelector(
+    'input[name="battery.sendExternalVoltage"]'
 );
 const externalVoltagePinInput = document.querySelector(
-    'input[name="other.externalVoltagePin"]'
+    'input[name="battery.externalVoltagePin"]'
 );
 
-sendBatteryVoltageCheckbox.addEventListener("change", function () {
-    externalVoltageMeasurementCheckbox.disabled = !this.checked;
-    externalVoltagePinInput.disabled =
-        !externalVoltageMeasurementCheckbox.checked;
+const voltageDividerR1 = document.querySelector(
+    'input[name="battery.voltageDividerR1"]'
+);
+
+const voltageDividerR2 = document.querySelector(
+    'input[name="battery.voltageDividerR2"]'
+);
+
+sendExternalVoltageCheckbox.addEventListener("change", function () {
+    externalVoltagePinInput.disabled = !this.checked;
+    voltageDividerR1.disabled = !this.checked;
+    voltageDividerR2.disabled = !this.checked;
+});
+
+const WebadminCheckbox = document.querySelector(
+    'input[name="webadmin.active"]'
+);
+
+const WebadminUsername = document.querySelector(
+    'input[name="webadmin.username"]'
+);
+
+const WebadminPassword = document.querySelector(
+    'input[name="webadmin.password"]'
+);
+WebadminCheckbox.addEventListener("change", function () {
+    WebadminUsername.disabled = !this.checked;
+    WebadminPassword.disabled = !this.checked;
 });
 
 document.querySelector(".new button").addEventListener("click", function () {
@@ -301,22 +359,14 @@ document.querySelector(".new button").addEventListener("click", function () {
     // Increment the name, id, and for attributes
     const attributeName = `wifi.AP.${networkCount}`;
     networkElement.innerHTML = `
-                <div class="form-floating col-6 col-md-3 px-1 mb-2">
+                <div class="form-floating col-6 col-md-5 px-1 mb-2">
                 <input type="text" class="form-control form-control-sm" name="${attributeName}.ssid" id="${attributeName}.ssid" placeholder="" >
                 <label for="${attributeName}.ssid">SSID</label>
                 </div>
-                <div class="form-floating col-6 col-md-3 px-1 mb-2">
-                <input type="text" class="form-control form-control-sm" name="${attributeName}.password" id="${attributeName}.password" placeholder="">
+                <div class="form-floating col-6 col-md-5 px-1 mb-2">
+                <input type="password" class="form-control form-control-sm" name="${attributeName}.password" id="${attributeName}.password" placeholder="">
                 <label for="${attributeName}.password">Passphrase</label>
                 </div>
-                <div class="col-4 col-md-2 form-floating px-1 mb-2">
-                <input type="text" class="form-control form-control-sm latitude" name="${attributeName}.latitude" id="${attributeName}.latitude" placeholder="">
-                <label for="${attributeName}.latitude">Latitude</label>
-                </div>
-                <div class="col-4 col-md-2 form-floating px-1 mb-2">
-                <input type="text" class="form-control form-control-sm longitude" name="${attributeName}.longitude" id="${attributeName}.longitude" placeholder="">
-                <label for="${attributeName}.longitude">Longitude</label>
-                </div>
                 <div class="col-4 col-md-2 d-flex align-items-center justify-content-end">
                 <div class="btn-group" role="group">
                     <button type="button" class="btn btn-sm btn-danger" title="Delete" onclick="return this.parentNode.parentNode.parentNode.remove();"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash3-fill" viewBox="0 0 16 16">
@@ -333,7 +383,76 @@ document.querySelector(".new button").addEventListener("click", function () {
     document.querySelector(".new").before(networkElement);
 });
 
-toggleFields();
+document
+    .getElementById("action.symbol")
+    .addEventListener("change", function () {
+        const value = document.getElementById("action.symbol").value;
+
+        document.getElementById("beacon.overlay").value = value[0];
+        document.getElementById("beacon.symbol").value = value[1];
+
+        updateImage();
+    });
+
+const speedStandards = {
+    300: [125, 5, 12],
+    244: [125, 6, 12],
+    209: [125, 7, 12],
+    183: [125, 8, 12],
+    610: [125, 8, 10],
+    1200: [125, 7, 9],
+};
+
+function refreshSpeedStandard() {
+    const bw = Number(document.getElementById("lora.signalBandwidth").value);
+    const cr4 = Number(document.getElementById("lora.codingRate4").value);
+    const sf = Number(document.getElementById("lora.spreadingFactor").value);
+
+    let found = false;
+
+    for (const speed in speedStandards) {
+        const standard = speedStandards[speed];
+
+        if (standard[0] !== bw / 1000) continue;
+        if (standard[1] !== cr4) continue;
+        if (standard[2] !== sf) continue;
+
+        document.getElementById("action.speed").value = speed;
+        found = true;
+
+        break;
+    }
+
+    if (!found) {
+        document.getElementById("action.speed").value = "";
+    }
+}
+
+document
+    .getElementById("lora.signalBandwidth")
+    .addEventListener("focusout", refreshSpeedStandard);
+document
+    .getElementById("lora.codingRate4")
+    .addEventListener("focusout", refreshSpeedStandard);
+document
+    .getElementById("lora.spreadingFactor")
+    .addEventListener("focusout", refreshSpeedStandard);
+
+document.getElementById("action.speed").addEventListener("change", function () {
+    const speed = document.getElementById("action.speed").value;
+
+    if (speed !== "") {
+        const value = speedStandards[Number(speed)];
+
+        const bw = value[0];
+        const cr4 = value[1];
+        const sf = value[2];
+
+        document.getElementById("lora.signalBandwidth").value = bw * 1000;
+        document.getElementById("lora.codingRate4").value = cr4;
+        document.getElementById("lora.spreadingFactor").value = sf;
+    }
+});
 
 const form = document.querySelector("form");
 
@@ -382,7 +501,58 @@ form.addEventListener("submit", async (event) => {
 
     saveModal.show();
 
-    setTimeout(checkConnection, 0);
+    setTimeout(checkConnection, 2000);
 });
 
 fetchSettings();
+
+function loadReceivedPackets(packets) {
+    if (packets) {
+        document.querySelector('#received-packets tbody').innerHTML = '';
+
+        const container = document.querySelector("#received-packets tbody");
+
+        container.innerHTML = '';
+
+        const date = new Date();
+
+        packets.forEach((packet) => {
+            const element = document.createElement("tr");
+        
+            element.innerHTML = `
+                        <td>${packet.rxTime}</td>
+                        <td>${packet.packet}</td>
+                        <td>${packet.RSSI}</td>
+                        <td>${packet.SNR}</td>
+                    `;
+
+            container.appendChild(element);
+        })
+    }
+
+    setTimeout(fetchReceivedPackets, 15000);
+}
+
+function fetchReceivedPackets() {
+    fetch("/received-packets.json")
+    .then((response) => response.json())
+    .then((packets) => {
+        loadReceivedPackets(packets);
+    })
+    .catch((err) => {
+        console.error(err);
+
+        console.error(`Failed to load received packets`);
+    });
+}
+
+document.querySelector('a[href="/received-packets"]').addEventListener('click', function (e) {
+    e.preventDefault();
+
+    document.getElementById('received-packets').classList.remove('d-none');
+    document.getElementById('configuration').classList.add('d-none');
+    
+    document.querySelector('button[type=submit]').remove();
+
+    fetchReceivedPackets();
+})

data_embed/style.css

@@ -0,0 +1,8 @@
+.alert-fixed {
+    position:fixed; 
+    top: 0px; 
+    left: 0px; 
+    width: 100%;
+    z-index:9999; 
+    border-radius:0px
+}

include/A7670_utils.h

@@ -0,0 +1,18 @@
+#ifndef A7670_UTILS_H_
+#define A7670_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace A7670_Utils {
+
+    bool checkModemOn();
+    void setup();
+    bool checkATResponse(const String& ATMessage);
+    void APRS_IS_connect();
+    void uploadToAPRSIS(const String& packet);
+    void listenAPRSIS();
+
+}
+
+#endif

include/README

@@ -1,39 +0,0 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the usual convention is to give header files names that end with `.h'.
-It is most portable to use only letters, digits, dashes, and underscores in
-header file names, and at most one dot.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

include/aprs_is_utils.h

@@ -0,0 +1,27 @@
+#ifndef APRS_IS_UTILS_H_
+#define APRS_IS_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace APRS_IS_Utils {
+
+    void    upload(const String& line);
+    void    connect();
+    
+    void    checkStatus();
+    String  checkForStartingBytes(const String& packet);
+    
+    String  buildPacketToUpload(const String& packet);
+    bool    processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty);
+    void    processLoRaPacket(const String& packet);
+
+    String  buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
+    void    processAPRSISPacket(const String& packet);
+    void    listenAPRSIS();
+
+    void    firstConnection();
+
+}
+
+#endif

include/battery_utils.h

@@ -0,0 +1,22 @@
+#ifndef BATTERY_UTILS_H_
+#define BATTERY_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace BATTERY_Utils {
+
+    void    adcCalibration();
+    void    adcCalibrationCheck();
+    void    setup();
+    float   checkInternalVoltage();
+    float   checkExternalVoltage();
+    void    checkIfShouldSleep(); // ????
+    void    startupBatteryHealth();
+
+    String  generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType);
+    String  generateEncodedTelemetry();
+
+}
+
+#endif

include/configuration.h

@@ -0,0 +1,167 @@
+#ifndef CONFIGURATION_H_
+#define CONFIGURATION_H_
+
+#include <Arduino.h>
+#include <vector>
+#include <FS.h>
+
+
+class WiFi_AP {
+public:
+    String  ssid;
+    String  password;
+};
+
+class WiFi_Auto_AP {
+public:
+    String  password;
+    int     timeout;
+};
+
+class BEACON {
+public:
+    double  latitude;
+    double  longitude;
+    String  comment;
+    int     interval;
+    String  overlay;
+    String  symbol;
+    String  path;    
+    bool    sendViaRF;
+    bool    sendViaAPRSIS;
+    bool    gpsActive;
+    bool    gpsAmbiguity;
+};
+
+class APRS_IS {
+public:
+    bool    active;
+    String  passcode;
+    String  server;
+    int     port;
+    String  filter;
+    bool    messagesToRF;
+    bool    objectsToRF;
+};
+
+class DIGI {
+public:
+    int     mode;
+    bool    ecoMode;
+};
+
+class LoraModule {
+public:
+    long    txFreq;
+    long    rxFreq;
+    bool    txActive;
+    bool    rxActive;
+    int     spreadingFactor;
+    long    signalBandwidth;
+    int     codingRate4;
+    int     power;
+};
+
+class Display {
+public:
+    bool    alwaysOn;
+    int     timeout;
+    bool    turn180;
+};
+
+class BATTERY {
+public:
+    bool    sendInternalVoltage;
+    bool    monitorInternalVoltage;
+    float   internalSleepVoltage;
+    bool    sendExternalVoltage;
+    int     externalVoltagePin;
+    bool    monitorExternalVoltage;
+    float   externalSleepVoltage;
+    float   voltageDividerR1;
+    float   voltageDividerR2;
+    bool    sendVoltageAsTelemetry;
+};
+
+class WXSENSOR {
+public:
+    bool    active;
+    int     heightCorrection;
+    float   temperatureCorrection;
+};
+
+class SYSLOG {
+public:
+    bool    active;
+    String  server;
+    int     port;
+};
+
+class TNC {
+public:
+    bool    enableServer;
+    bool    enableSerial;
+    bool    acceptOwn;
+};
+
+class OTA {
+public:
+    String  username;
+    String  password;
+};
+
+class WEBADMIN {
+public:
+    bool    active;
+    String  username;
+    String  password;
+};
+
+class NTP {
+public:
+    float   gmtCorrection;
+};
+
+class REMOTE_MANAGEMENT {
+public:
+    String  managers;
+    bool    rfOnly;
+};
+
+class Configuration {
+public:
+    String                  callsign;
+    int                     rememberStationTime;
+    bool                    lowPowerMode;
+    double                  lowVoltageCutOff;
+    bool                    backupDigiMode;
+    bool                    rebootMode;
+    int                     rebootModeTime;
+    String                  personalNote;
+    String                  blacklist;
+    std::vector<WiFi_AP>    wifiAPs;
+    WiFi_Auto_AP            wifiAutoAP;
+    BEACON                  beacon;
+    APRS_IS                 aprs_is;
+    DIGI                    digi;
+    LoraModule              loramodule;
+    Display                 display;
+    BATTERY                 battery;
+    WXSENSOR                wxsensor;
+    SYSLOG                  syslog;
+    TNC                     tnc;  
+    OTA                     ota;
+    WEBADMIN                webadmin;
+    NTP                     ntp;    
+    REMOTE_MANAGEMENT       remoteManagement;
+  
+    void init();
+    void writeFile();
+    Configuration();
+
+private:
+    bool readFile();
+    String _filePath;
+};
+
+#endif

include/digi_utils.h

@@ -0,0 +1,16 @@
+#ifndef DIGI_UTILS_H_
+#define DIGI_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace DIGI_Utils {
+
+    String  buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq);
+    String  generateDigipeatedPacket(const String& packet, bool thirdParty);
+    void    processLoRaPacket(const String& packet);
+    void    checkEcoMode();
+
+}
+
+#endif

include/display.h

@@ -0,0 +1,14 @@
+#ifndef DISPLAY_H_
+#define DISPLAY_H_
+
+#include <Arduino.h>
+
+#define SCREEN_ADDRESS  0x3C    ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
+
+void displaySetup();
+void displayToggle(bool toggle);
+
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, int wait = 0);
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, const String& line6, int wait = 0);
+
+#endif

include/gps_utils.h

@@ -0,0 +1,23 @@
+#ifndef GPS_UTILS_H_
+#define GPS_UTILS_H_
+
+#include <Arduino.h>
+
+
+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();
+    String  decodeEncodedGPS(const String& packet);
+    String  getReceivedGPS(const String& packet);
+    String  getDistanceAndComment(const String& packet);
+
+    void    setup();
+    void    getData();
+
+}
+
+#endif

include/kiss_protocol.h

@@ -0,0 +1,23 @@
+#define DCD_ON            0x03
+
+#define FEND              0xC0
+#define FESC              0xDB
+#define TFEND             0xDC
+#define TFESC             0xDD
+
+#define CMD_UNKNOWN       0xFE
+#define CMD_DATA          0x00
+#define CMD_HARDWARE      0x06
+
+#define HW_RSSI           0x21
+
+#define CMD_ERROR         0x90
+#define ERROR_INITRADIO   0x01
+#define ERROR_TXFAILED    0x02
+#define ERROR_QUEUE_FULL  0x04
+
+#define APRS_CONTROL_FIELD 0x03
+#define APRS_INFORMATION_FIELD 0xf0
+
+#define HAS_BEEN_DIGIPITED_MASK 0b10000000
+#define IS_LAST_ADDRESS_POSITION_MASK 0b1

include/kiss_utils.h

@@ -0,0 +1,16 @@
+#ifndef KISS_UTILS_H_
+#define KISS_UTILS_H_
+
+#include <Arduino.h>
+
+
+String encodeAddressAX25(String tnc2Address);
+String decodeAddressAX25(const String& ax25Address, bool& isLast, bool isRelay);
+
+String encapsulateKISS(const String& ax25Frame, uint8_t cmd);
+String decapsulateKISS(const String& frame);
+
+String encodeKISS(const String& frame);
+String decodeKISS(const String& inputFrame, bool& dataFrame);
+
+#endif

include/lora_utils.h

@@ -0,0 +1,20 @@
+#ifndef LORA_UTILS_H_
+#define LORA_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace LoRa_Utils {
+
+    void    setup();
+    void    sendNewPacket(const String& newPacket);
+    //String  packetSanitization(const String& packet);
+    String  receivePacket();
+    void    changeFreqTx();
+    void    changeFreqRx();
+    void    startReceive();
+    void    sleepRadio();
+
+}
+
+#endif

include/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

include/power_utils.h

@@ -0,0 +1,26 @@
+#ifndef POWER_UTILS_H_
+#define POWER_UTILS_H_
+
+#include <Arduino.h>
+#if defined(HAS_AXP192) || defined(HAS_AXP2101)
+    #include "XPowersLib.h"
+#else
+    #include <Wire.h>
+#endif
+
+
+namespace POWER_Utils {
+
+    double  getBatteryVoltage();
+    bool    isBatteryConnected();
+    void    activateMeasurement();
+    void    activateGPS();
+    void    deactivateGPS();
+    void    activateLoRa();
+    void    deactivateLoRa();
+    bool    begin(TwoWire &port);
+    void    setup();
+
+}
+
+#endif

include/query_utils.h

@@ -0,0 +1,13 @@
+#ifndef QUERY_UTILS_H_
+#define QUERY_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace QUERY_Utils {
+
+    String process(const String& query, const String& station, bool queryFromAPRSIS, bool thirdParty);
+
+}
+
+#endif

include/station_utils.h

@@ -0,0 +1,36 @@
+#ifndef STATION_UTILS_H_
+#define STATION_UTILS_H_
+
+
+#include <Arduino.h>
+
+
+struct Packet25SegBuffer {
+    uint32_t    receivedTime;
+    String      station;
+    String      payload;
+};
+
+struct LastHeardStation {
+    uint32_t    lastHeardTime;
+    String      station;
+};
+
+namespace STATION_Utils {
+
+    void loadBlacklist();
+    void loadManagers();
+    bool isBlacklisted(const String& callsign);
+    bool isManager(const String& callsign);
+    bool checkObjectTime(const String& packet);
+    void deleteNotHeard();
+    void updateLastHeard(const String& station);
+    bool wasHeard(const String& station);
+    void clean25SegBuffer();
+    bool check25SegBuffer(const String& station, const String& textMessage);
+    void processOutputPacketBuffer();
+    void addToOutputPacketBuffer(const String& packet);
+
+}
+
+#endif

include/syslog_utils.h

@@ -0,0 +1,14 @@
+#ifndef SYSLOG_H_
+#define SYSLOG_H_
+
+#include <Arduino.h>
+
+
+namespace SYSLOG_Utils {
+
+    void log(const uint8_t type ,const String& packet, const int rssi, const float snr, const int freqError);
+    void setup();
+
+}
+
+#endif

include/tnc_utils.h

@@ -0,0 +1,17 @@
+#ifndef TNC_UTILS_H_
+#define TNC_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace TNC_Utils {
+
+    void setup();
+    void loop();
+    
+    void sendToClients(const String& packet);
+    void sendToSerial(const String& packet);
+
+}
+
+#endif

include/utils.h

@@ -0,0 +1,34 @@
+#ifndef UTILS_H_
+#define UTILS_H_
+
+#include <Arduino.h>
+
+
+class ReceivedPacket {
+public:
+    String  rxTime;
+    String  packet;
+    int     RSSI;
+    float   SNR;
+};
+
+namespace Utils {
+
+    void    processStatus();
+    String  getLocalIP();
+    void    setupDisplay();
+    void    activeStations();
+    void    checkBeaconInterval();
+    void    checkDisplayInterval();
+    void    validateFreqs();
+    void    typeOfPacket(const String& packet, const uint8_t packetType);
+    void    print(const String& text);
+    void    println(const String& text);
+    void    checkRebootMode();
+    void    checkRebootTime();
+    void    checkSleepByLowBatteryVoltage(uint8_t mode);
+    bool    checkValidCallsign(const String& callsign);
+
+}
+
+#endif

include/web_utils.h

@@ -9,16 +9,10 @@
 
 
 namespace WEB_Utils {
-  
-    void loop();
 
     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);

include/wifi_utils.h

@@ -9,7 +9,7 @@ namespace WIFI_Utils {
     void checkWiFi();
     void startAutoAP();
     void startWiFi();
-    void checkIfAutoAPShouldPowerOff();
+    void checkAutoAPTimeout();
     void setup();
     
 }

include/wx_utils.h

@@ -0,0 +1,23 @@
+#ifndef WX_UTILS_H_
+#define WX_UTILS_H_
+
+#include <Adafruit_Sensor.h>
+#include <Adafruit_BME280.h>
+#include <Adafruit_BMP280.h>
+#include <Adafruit_BME680.h>
+#include "Adafruit_Si7021.h"
+#include <Arduino.h>
+
+
+namespace WX_Utils {
+
+    void    getWxModuleAddres();
+    void    setup();
+    String  generateTempString(const float sensorTemp);
+    String  generateHumString(const float sensorHum);
+    String  generatePresString(const float sensorPres);
+    String  readDataSensor();
+
+}
+
+#endif

installer/install_upgrade.bat

@@ -1,39 +0,0 @@
-@echo off
-echo Loading...
-
-where /q python.exe
-if %errorlevel% neq 0 (
-    echo "Python is not installed. Please install it and try again."
-    exit /b
-)
-
-where /q pip
-if %errorlevel% neq 0 (
-    echo "pip is not installed. Please install it and try again."
-    exit /b
-)
-
-pip show pyserial >nul 2>&1
-if %errorlevel% neq 0 (
-    echo "Installing pyserial..."
-    pip install pyserial
-)
-
-echo Your firmware will be upgraded without factory reset.
-
-echo:
-
-echo IF THIS IS YOUR FIRST FLASH ON THIS BOARD PLEASE USE install_with_factory_reset.bat INSTEAD!
-
-echo:
-
-echo Available COM ports:
-python.exe -c "import serial.tools.list_ports; print('\n'.join([str(c) for c in serial.tools.list_ports.comports()]))"
-
-echo:
-
-set /p port="Enter COM port (for example COM5): "
-
-python.exe ./bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-pause

installer/install_upgrade.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-echo "Your firmware will be upgraded without factory reset."
-echo "IF THIS IS YOUR FIRST FLASH ON THIS BOARD PLEASE USE install_with_factory_reset.sh INSTEAD!"
-
-read -p "Enter COM port (for example /dev/ttyS5): " port
-
-python3 ./bin/esptool/esptool.py --chip esp32 --port "$port" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-echo "Firmware flashed"

installer/install_with_factory_reset.bat

@@ -1,44 +0,0 @@
-@echo off
-echo Loading...
-
-where /q python.exe
-if %errorlevel% neq 0 (
-    echo "Python is not installed. Please install it and try again."
-    exit /b
-)
-
-where /q pip
-if %errorlevel% neq 0 (
-    echo "pip is not installed. Please install it and try again."
-    exit /b
-)
-
-pip show pyserial >nul 2>&1
-if %errorlevel% neq 0 (
-    echo "Installing pyserial..."
-    pip install pyserial
-)
-
-
-echo Your current configuration will be LOST!!!
-echo Your current configuration will be LOST!!!
-echo Your current configuration will be LOST!!!
-
-echo:
-
-echo If you already have this board flashed with our firmware please use install_upgrade.bat instead!
-
-echo:
-
-echo Available COM ports:
-python.exe -c "import serial.tools.list_ports; print('\n'.join([str(c) for c in serial.tools.list_ports.comports()]))"
-
-echo:
-
-set /p port="Enter COM port (for example COM5): "
-
-python.exe bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 2686976 firmware/spiffs.bin
-
-python.exe bin/esptool/esptool.py --chip esp32 --port "%port%" --baud 460800 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 firmware/bootloader.bin 0x8000 firmware/partitions.bin 0xe000 firmware/boot_app0.bin 0x10000 firmware/firmware.bin
-
-pause

platformio.ini

@@ -11,8 +11,13 @@
 [platformio]
 default_envs = ttgo-lora32-v21
 
+extra_configs =
+	common_settings.ini
+	variants/*/platformio.ini
+
 [env]
-platform = espressif32 @ 6.3.1
+platform = espressif32 @ 6.7.0
+board_build.partitions = min_spiffs.csv
 framework = arduino
 monitor_speed = 115200
 board_build.embed_files = 
@@ -21,65 +26,7 @@ board_build.embed_files =
 	data_embed/script.js.gz
 	data_embed/bootstrap.css.gz
 	data_embed/bootstrap.js.gz
-lib_deps = 
-	bblanchon/ArduinoJson@^6.20.2
-	sandeepmistry/LoRa@^0.8.0
-	adafruit/Adafruit GFX Library @ 1.11.5
-	adafruit/Adafruit SSD1306 @ 2.5.7
-	mikalhart/TinyGPSPlus @ 1.0.3
-	adafruit/Adafruit Unified Sensor@^1.1.9
-	adafruit/Adafruit BME280 Library@^2.2.2
-	adafruit/Adafruit BMP280 Library@^2.6.8
-	adafruit/Adafruit BME680 Library@^2.0.4
-	jgromes/RadioLib @ 6.1.0
-	lewisxhe/XPowersLib@^0.1.8
-	ayushsharma82/ElegantOTA@^3.1.0
-	ottowinter/ESPAsyncWebServer-esphome@3.0.0
-	esphome/AsyncTCP-esphome@2.1.1
-	
+	data_embed/favicon.png.gz
 extra_scripts = 
 	pre:tools/compress.py
-
-[env:ttgo-lora32-v21]
-board = ttgo-lora32-v21
-build_flags = -Werror -Wall -DTTGO_T_LORA32_V2_1 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec-lora32-v2]
-board = ttgo-lora32-v21
-build_flags = -Werror -Wall -DHELTEC_V2 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec_wifi_lora_32_V3]
-board = heltec_wifi_lora_32_V3
-build_flags = -Werror -Wall -DHELTEC_V3 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-board_build.mcu = esp32s3
-
-[env:ESP32_DIY_LoRa]
-board = esp32dev
-build_flags = -Werror -Wall -DESP32_DIY_LoRa -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ESP32_DIY_1W_LoRa]
-board = esp32dev
-build_flags = -Werror -Wall -DESP32_DIY_1W_LoRa -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_2]
-board = ttgo-t-beam
-build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1]
-board = ttgo-t-beam
-build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_SX1268]
-board = ttgo-t-beam
-build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0_SX1268 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:ttgo-t-beam-v1_2_SX1262]
-board = ttgo-t-beam
-build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2_SX1262 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-
-[env:heltec_wireless_stick_lite]
-platform = espressif32
-board = heltec_wireless_stick_lite
-board_build.mcu = esp32c3
-board_build.f_cpu = 240000000L
-build_flags = -Werror -Wall -DHELTEC_CT62 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+debug_tool = esp-prog

src/A7670_utils.cpp

@@ -0,0 +1,206 @@
+#include "configuration.h"
+#include "aprs_is_utils.h"
+#include "board_pinout.h"
+#include "A7670_utils.h"
+#include "lora_utils.h"
+#include "display.h"
+#include "utils.h"
+
+
+#ifdef HAS_A7670
+    #define TINY_GSM_MODEM_SIM7600      //The AT instruction of A7670 is compatible with SIM7600 
+    #define TINY_GSM_RX_BUFFER 1024     // Set RX buffer to 1Kb
+    #define SerialAT Serial1
+    #include <TinyGsmClient.h>
+    #include <StreamDebugger.h>
+    StreamDebugger debugger(SerialAT, Serial);
+    TinyGsm modem(debugger);
+
+    extern Configuration    Config;
+    extern String           firstLine;
+
+    bool modemStartUp       = false;
+    bool serverStartUp      = false;
+    bool userBytesSended    = false;
+    bool beaconBytesSended  = false;
+    bool beaconSended       = false;
+    bool stationBeacon      = false;
+
+    extern bool modemLoggedToAPRSIS;
+
+
+    namespace A7670_Utils {
+
+        bool checkModemOn() {
+            bool modemReady = false;
+            Serial.print("Starting Modem ...              ");
+            displayShow(firstLine, "Starting Modem...", " ", " ", 0);
+
+            pinMode(A7670_ResetPin, OUTPUT);        //A7670 Reset
+            digitalWrite(A7670_ResetPin, LOW);
+            delay(100);
+            digitalWrite(A7670_ResetPin, HIGH);
+            delay(3000);
+            digitalWrite(A7670_ResetPin, LOW);
+
+            pinMode(A7670_PWR_PIN, OUTPUT);
+            digitalWrite(A7670_PWR_PIN, LOW);
+            delay(100);
+            digitalWrite(A7670_PWR_PIN, HIGH);
+            delay(1000);
+            digitalWrite(A7670_PWR_PIN, LOW);
+
+            int i = 20;
+            while (i) {
+                SerialAT.println("AT");
+                delay(500);
+                if (SerialAT.available()) {
+                    String r = SerialAT.readString();
+                    //Serial.println(r);
+                    if ( r.indexOf("OK") >= 0 ) {
+                        modemReady = true;
+                        i = 1;
+                        Serial.println("Modem Ready!\n");
+                        displayShow(firstLine, "Starting Modem...", "---> Modem Ready", " ", 0);
+                        return true;
+                    }
+                }
+                if (!modemReady) {
+                    delay(500);
+                }
+                i--;
+            }
+            return false;
+        }
+
+        void setup() {
+            SerialAT.begin(115200, SERIAL_8N1, A7670_RX_PIN, A7670_TX_PIN);
+            if (checkModemOn()) {;
+                delay(1000);
+                //setup_gps();      // if gps active / won't be need for now
+            } else {
+                displayShow(firstLine, "Starting Modem...", "---> Failed !!!", " ", 0);
+                Serial.println(F("*********** Failed to connect to the modem! ***********"));
+            }
+        }
+
+        bool checkATResponse(const String& ATMessage) {
+            int delayATMessage = 3000;
+            bool validAT = false;
+            //Serial.println(ATMessage);
+            int i = 10;
+            while (i) {
+                if (!validAT) {
+                    SerialAT.println(ATMessage);
+                }
+                delay(500);
+                if (SerialAT.available()) {
+                    String response = SerialAT.readString();
+                    //Serial.println(response); // DEBUG of Modem AT message
+                    if(response.indexOf("verified") >= 0) {
+                        Serial.println("Logged! (User Validated)\n");
+                        displayShow(firstLine, "Connecting APRS-IS...", "---> Logged!", " ", 1000);
+                        Serial.println("####################   APRS-IS FEED   ####################");
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage == "AT+NETOPEN" && response.indexOf("OK") >= 0) {
+                        Serial.println("Port Open!");
+                        displayShow(firstLine, "Opening Port...", "---> Port Open", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage == "AT+NETOPEN" && response.indexOf("Network is already opened") >= 0) {
+                        Serial.println("Port Open! (was already opened)");
+                        displayShow(firstLine, "Opening Port...", "---> Port Open", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf("AT+CIPOPEN") == 0 && response.indexOf("PB DONE") >= 0) {
+                        Serial.println("Contacted!");
+                        displayShow(firstLine, "Connecting APRS-IS...", "---> Contacted", " ", 0);
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf("AT+CIPSEND=0,") == 0 && response.indexOf(">") >= 0) {
+                        Serial.print(".");
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (ATMessage.indexOf(Config.callsign) >= 3 && !modemLoggedToAPRSIS && response.indexOf("OK") >= 0 && !stationBeacon) { // login info
+                        validAT = true;
+                        delayATMessage = 0;       
+                    } else if (ATMessage.indexOf(Config.callsign) == 0 && !beaconSended && response.indexOf("OK") >= 0 && !stationBeacon) {   // self beacon or querys
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    } else if (stationBeacon && response.indexOf("OK") >= 0) { //upload others beacons
+                        validAT = true;
+                        i = 1;
+                        delayATMessage = 0;
+                    }
+                }
+                delay(delayATMessage);
+                i--;
+            }
+            return validAT;
+        }
+
+        void APRS_IS_connect() {
+            String loginInfo = "user ";
+            loginInfo += Config.callsign;
+            loginInfo += " pass ";
+            loginInfo += String(Config.aprs_is.passcode);
+            loginInfo += " vers CA2RXU_LoRa_iGate 1.3 filter ";
+            loginInfo += Config.aprs_is.filter;
+            Serial.println("-----> Connecting to APRS IS");
+            while (!modemStartUp) {
+                Serial.print("Opening Port...                 ");
+                displayShow(firstLine, "Opening Port...", " ", " ", 0);
+                modemStartUp = checkATResponse("AT+NETOPEN");
+                delay(2000);
+            } while (!serverStartUp) {
+                Serial.print("Connecting APRS-IS Server...    ");
+                displayShow(firstLine, "Connecting APRS-IS...", " ", " ", 0);
+                serverStartUp = checkATResponse("AT+CIPOPEN=0,\"TCP\",\"" + String(Config.aprs_is.server) + "\"," + String(Config.aprs_is.port));
+                delay(2000);
+            } while (!userBytesSended) {
+                Serial.print("Writing User Login Data       ");
+                displayShow(firstLine, "Connecting APRS-IS...", "---> User Login Data", " ", 0);
+                userBytesSended = checkATResponse("AT+CIPSEND=0," + String(loginInfo.length()+1));
+                delay(2000);
+            } while (!modemLoggedToAPRSIS) {
+                Serial.print(".");
+                modemLoggedToAPRSIS = checkATResponse(loginInfo);
+                delay(2000);
+            }
+        }
+
+        void uploadToAPRSIS(const String& packet) {
+            beaconBytesSended = checkATResponse("AT+CIPSEND=0," + String(packet.length()+1));
+            delay(2000);
+            if (beaconBytesSended) {
+                Serial.print(".");
+                beaconSended = checkATResponse(packet);
+            } 
+            if (!beaconSended) {
+                Serial.println("------------------------------------> UPLOAD FAILED!!!");
+            } else {
+                Serial.println("Packet Uploaded to APRS-IS!");
+            }
+            beaconBytesSended = false;
+            beaconSended = false;
+        }
+
+        void listenAPRSIS() {
+            if (SerialAT.available()) {
+                String packetAPRSIS = SerialAT.readStringUntil('\r');
+                packetAPRSIS.trim();
+                if (!packetAPRSIS.startsWith("#") && packetAPRSIS.indexOf("+IPD") == -1 && packetAPRSIS.indexOf("RECV") == -1 && packetAPRSIS.length() > 0) {
+                    APRS_IS_Utils::processAPRSISPacket(packetAPRSIS);
+                }
+            }
+            delay(1);
+        }
+    }
+#endif

src/LoRa_APRS_iGate.cpp

@@ -1,113 +1,242 @@
+/*___________________________________________________________________
+
+██╗      ██████╗ ██████╗  █████╗      █████╗ ██████╗ ██████╗ ███████╗
+██║     ██╔═══██╗██╔══██╗██╔══██╗    ██╔══██╗██╔══██╗██╔══██╗██╔════╝
+██║     ██║   ██║██████╔╝███████║    ███████║██████╔╝██████╔╝███████╗
+██║     ██║   ██║██╔══██╗██╔══██║    ██╔══██║██╔═══╝ ██╔══██╗╚════██║
+███████╗╚██████╔╝██║  ██║██║  ██║    ██║  ██║██║     ██║  ██║███████║
+╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝    ╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚══════╝
+                                                                     
+                ██╗ ██████╗  █████╗ ████████╗███████╗
+                ██║██╔════╝ ██╔══██╗╚══██╔══╝██╔════╝
+                ██║██║  ███╗███████║   ██║   █████╗
+                ██║██║   ██║██╔══██║   ██║   ██╔══╝
+                ██║╚██████╔╝██║  ██║   ██║   ███████╗
+                ╚═╝ ╚═════╝ ╚═╝  ╚═╝   ╚═╝   ╚══════╝
+
+
+                       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>
 #include "configuration.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
+#include "battery_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
-#include "pins_config.h"
-#include "query_utils.h"
 #include "power_utils.h"
 #include "lora_utils.h"
 #include "wifi_utils.h"
 #include "digi_utils.h"
 #include "gps_utils.h"
-#include "bme_utils.h"
 #include "web_utils.h"
+#include "tnc_utils.h"
+#include "ntp_utils.h"
+#include "wx_utils.h"
 #include "display.h"
 #include "utils.h"
+#ifdef HAS_A7670
+    #include "A7670_utils.h"
+#endif
 
 
-Configuration   Config;
-WiFiClient      espClient;
+String              versionDate             = "2025.03.20";
+Configuration       Config;
+WiFiClient          espClient;
+#ifdef HAS_GPS
+    HardwareSerial  gpsSerial(1);
+    TinyGPSPlus     gps;
+    uint32_t        gpsSatelliteTime        = 0;
+    bool            gpsInfoToggle           = false;
+#endif
 
-String          versionDate           = "2024.02.25";
-int             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];
 
-int             stationMode           = Config.stationMode;
-bool            statusAfterBoot       = true;
-bool            beaconUpdate          = true;
-uint32_t        lastBeaconTx          = 0;
-uint32_t        previousWiFiMillis    = 0;
-uint32_t        lastScreenOn          = millis();
+bool                isUpdatingOTA           = false;
+uint32_t            lastBatteryCheck        = 0;
 
-uint32_t        lastWiFiCheck         = 0;
-bool            WiFiConnect           = true;
-bool            WiFiConnected         = false;
-int             lastStationModeState  = 1;
+bool                backUpDigiMode          = false;
+bool                modemLoggedToAPRSIS     = false;
 
-bool            WiFiAutoAPStarted     = false;
-long            WiFiAutoAPTime        = false;
+#ifdef HAS_EPAPER
+    uint32_t        lastEpaperTime          = 0;
+    extern String   lastEpaperText;
+#endif
 
-String          batteryVoltage;
+std::vector<ReceivedPacket> receivedPackets;
 
-std::vector<String> lastHeardStation;
-std::vector<String> lastHeardStation_temp;
-std::vector<String> packetBuffer;
-std::vector<String> packetBuffer_temp;
+String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
+//#define STARTUP_DELAY 5 //min
 
-String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, iGateBeaconPacket, iGateLoRaBeaconPacket;
 
 void setup() {
     Serial.begin(115200);
-
-    #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2)
-    pinMode(batteryPin, INPUT);
-    #endif
-    #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-    pinMode(internalLedPin, OUTPUT);
-    #endif
-    if (Config.externalVoltageMeasurement) {
-        pinMode(Config.externalVoltagePin, INPUT);
-    }
-    #if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
     POWER_Utils::setup();
-    #endif
-    delay(1000);
     Utils::setupDisplay();
-    WIFI_Utils::setup();
     LoRa_Utils::setup();
-    Utils::validateDigiFreqs();
-    iGateBeaconPacket = GPS_Utils::generateBeacon();
-    iGateLoRaBeaconPacket = GPS_Utils::generateiGateLoRaBeacon();
+    Utils::validateFreqs();
+    GPS_Utils::setup();
+    STATION_Utils::loadBlacklist();
+    STATION_Utils::loadManagers();
+
+    #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
+        displayShow("", "  STARTUP DELAY ...", "", "", 0);
+        delay(STARTUP_DELAY * 60 * 1000);
+    #endif
+
+    #ifdef HELTEC_HTCT62
+        if (Config.lowPowerMode) {
+            gpio_wakeup_enable(GPIO_NUM_3, GPIO_INTR_HIGH_LEVEL);
+            esp_deep_sleep_enable_gpio_wakeup(GPIO_NUM_3, ESP_GPIO_WAKEUP_GPIO_HIGH);
+            long lastBeacon = 0;
+            LoRa_Utils::startReceive();
+            while (true) {
+                auto wakeup_reason = esp_sleep_get_wakeup_cause();
+                if (wakeup_reason == 7) { // packet received
+                    Serial.println("Received packet");
+                    String packet = LoRa_Utils::receivePacket();
+                    Serial.println(packet);
+                    if (Config.digi.mode == 2) DIGI_Utils::processLoRaPacket(packet);
+
+                    if (packet.indexOf(Config.callsign + ":?APRSELP{") != -1) { // Send `?APRSELP` to exit low power
+                        Serial.println("Got ?APRSELP message, exiting from low power mode");
+                        break;
+                    };
+                }
+                long time = esp_timer_get_time() / 1000000;
+                if (lastBeacon == 0 || time - lastBeacon >= Config.beacon.interval * 60) {
+                    Serial.println("Sending beacon");
+                    String comment = Config.beacon.comment;
+                    if (Config.battery.sendInternalVoltage) comment += " Batt=" + String(BATTERY_Utils::checkInternalVoltage(),2) + "V";
+                    if (Config.battery.sendExternalVoltage) comment += " Ext=" + String(BATTERY_Utils::checkExternalVoltage(),2) + "V";
+                    LoRa_Utils::sendNewPacket(GPS_Utils::getiGateLoRaBeaconPacket() + comment);
+                    lastBeacon = time;
+                }
+
+                LoRa_Utils::startReceive();
+                Serial.println("Sleeping");
+                long sleep = (Config.beacon.interval * 60) - (time - lastBeacon);
+                Serial.flush();
+                esp_sleep_enable_timer_wakeup(sleep * 1000000);
+                esp_light_sleep_start();
+                Serial.println("Waked up");
+            }
+            Config.loramodule.rxActive = false;
+        }
+    #endif
+    DIGI_Utils::checkEcoMode();
+    WIFI_Utils::setup();
+    NTP_Utils::setup();
     SYSLOG_Utils::setup();
-    BME_Utils::setup();
+    WX_Utils::setup();
     WEB_Utils::setup();
+    TNC_Utils::setup();
+    #ifdef HAS_A7670
+        A7670_Utils::setup();
+    #endif
+    Utils::checkRebootMode();
+    APRS_IS_Utils::firstConnection();
 }
 
 void loop() {
-    WEB_Utils::loop();
+    WIFI_Utils::checkAutoAPTimeout();
 
-    WIFI_Utils::checkIfAutoAPShouldPowerOff();
+    if (isUpdatingOTA) {
+        ElegantOTA.loop();
+        return; // Don't process IGate and Digi during OTA update
+    }
 
-    if (stationMode==1 || stationMode==2 ) {          // iGate (1 Only Rx / 2 Rx+Tx)
-        if (!WiFiConnected) {
+    if (Config.lowVoltageCutOff > 0) {
+        BATTERY_Utils::checkIfShouldSleep();
+    }
+    
+    #ifdef HAS_GPS
+        if (Config.beacon.gpsActive) {
+            if (millis() - gpsSatelliteTime > 5000) {
+                gpsInfoToggle = !gpsInfoToggle;
+                gpsSatelliteTime = millis();
+            }
+            if (gpsInfoToggle) {
+                thirdLine = "Satellite(s): ";
+                String gpsData = String(gps.satellites.value());
+                if (gpsData.length() < 2) gpsData = "0" + gpsData;  // Ensure two-digit formatting
+                thirdLine += gpsData;
+            } else {
+                thirdLine = Utils::getLocalIP();
+            }
+        } else {
             thirdLine = Utils::getLocalIP();
         }
-
-        WIFI_Utils::checkWiFi();
-        if (!espClient.connected()) {
-            APRS_IS_Utils::connect();
-        }
-        APRS_IS_Utils::loop();
-    } else if (stationMode==3 || stationMode==4) {    // DigiRepeater (3 RxFreq=TxFreq / 4 RxFreq!=TxFreq)
-        DIGI_Utils::loop();
-    } else if (stationMode==5) {                      // iGate when WiFi and APRS available , DigiRepeater when not (RxFreq=TxFreq)
-        Utils::checkWiFiInterval();
+    #else
         thirdLine = Utils::getLocalIP();
-        if (WiFi.status() == WL_CONNECTED) {  // iGate Mode
-            if (!espClient.connected()) {
-                APRS_IS_Utils::connect();
-            }
-            if (lastStationModeState == 1) {
-                iGateBeaconPacket = GPS_Utils::generateBeacon();
-                lastStationModeState = 0;
-            }
-            APRS_IS_Utils::loop();
-        } else {                              // DigiRepeater Mode
-            DIGI_Utils::loop();
+    #endif
+
+    #ifdef HAS_A7670
+        if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
+    #else
+        WIFI_Utils::checkWiFi();
+        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
+    #endif
+
+    NTP_Utils::update();
+    TNC_Utils::loop();
+
+    Utils::checkDisplayInterval();
+    Utils::checkBeaconInterval();
+    
+    APRS_IS_Utils::checkStatus(); // Need that to update display, maybe split this and send APRSIS status to display func?
+
+    String packet = "";
+    if (Config.loramodule.rxActive) {
+        packet = LoRa_Utils::receivePacket(); // We need to fetch LoRa packet above APRSIS and Digi
+    }
+
+    if (packet != "") {
+        if (Config.aprs_is.active) { // If APRSIS enabled
+            APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
+        }
+
+        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
+        }
+
+        if (Config.tnc.enableServer) { // If TNC server enabled
+            TNC_Utils::sendToClients(packet); // Send received packet to TNC KISS
+        }
+        if (Config.tnc.enableSerial) { // If Serial KISS enabled
+            TNC_Utils::sendToSerial(packet); // Send received packet to Serial KISS
         }
     }
+
+    if (Config.aprs_is.active) {
+        APRS_IS_Utils::listenAPRSIS(); // listen received packet from APRSIS
+    }
+
+    STATION_Utils::processOutputPacketBuffer();
+
+    #ifdef HAS_EPAPER   // Only consider updating every 10 seconds (when data to show is different from before)
+        if(lastEpaperTime == 0 || millis() - lastEpaperTime > 10000) {
+            String posibleEpaperText = firstLine + secondLine + thirdLine + fourthLine + fifthLine + sixthLine + seventhLine;
+            if (lastEpaperText != posibleEpaperText) {
+                displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                lastEpaperText = posibleEpaperText;
+                lastEpaperTime = millis();
+            }
+        }
+    #else
+        displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+    #endif
+
+    Utils::checkRebootTime();
+    Utils::checkSleepByLowBatteryVoltage(1);
 }

src/aprs_is_utils.cpp

@@ -1,39 +1,45 @@
-#include <ElegantOTA.h>
 #include <WiFi.h>
 #include "configuration.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "syslog_utils.h"
 #include "query_utils.h"
-#include "lora_utils.h"
+#include "A7670_utils.h"
 #include "digi_utils.h"
 #include "display.h"
 #include "utils.h"
 
-extern Configuration  Config;
-extern WiFiClient     espClient;
-extern int            internalLedPin;
-extern uint32_t       lastScreenOn;
-extern int            stationMode;
-extern String         firstLine;
-extern String         secondLine;
-extern String         thirdLine;
-extern String         fourthLine;
-extern String         fifthLine;
-extern String         sixthLine;
-extern String         seventhLine;
+
+extern Configuration        Config;
+extern WiFiClient           espClient;
+extern uint32_t             lastScreenOn;
+extern String               firstLine;
+extern String               secondLine;
+extern String               thirdLine;
+extern String               fourthLine;
+extern String               fifthLine;
+extern String               sixthLine;
+extern String               seventhLine;
+extern bool                 modemLoggedToAPRSIS;
+extern bool                 backUpDigiMode;
+
+uint32_t    lastRxTime      = millis();
+bool        passcodeValid   = false;
+
+#ifdef HAS_A7670
+    extern bool                 stationBeacon;
+#endif
 
 
 namespace APRS_IS_Utils {
 
-    void upload(String line) {
+    void upload(const String& line) {
         espClient.print(line + "\r\n");
     }
 
-    void connect(){
-        int count = 0;
-        String aprsauth;
+    void connect() {
         Serial.print("Connecting to APRS-IS ...     ");
+        uint8_t count = 0;
         while (!espClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
             Serial.println("Didn't connect with server...");
             delay(1000);
@@ -47,192 +53,322 @@ namespace APRS_IS_Utils {
         if (count == 20) {
             Serial.println("Tried: " + String(count) + " FAILED!");
         } else {
-            Serial.println("Connected!\n(Server: " + String(Config.aprs_is.server) + " / Port: " + String(Config.aprs_is.port) +")");
-            aprsauth = "user " + Config.callsign + " pass " + Config.aprs_is.passcode + " vers CA2RXU_LoRa_iGate 1.3 filter t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance;// + "\r\n"; 
-            upload(aprsauth);
-            delay(200);
+            Serial.println("Connected!\n(Server: " + String(Config.aprs_is.server) + " / Port: " + String(Config.aprs_is.port) + ")");
+            // String filter = "t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance;
+            String aprsAuth = "user ";
+            aprsAuth += Config.callsign;
+            aprsAuth += " pass ";
+            aprsAuth += Config.aprs_is.passcode;
+            aprsAuth += " vers CA2RXU_iGate 2.3 filter ";
+            aprsAuth += Config.aprs_is.filter;
+            upload(aprsAuth);
         }
     }
 
     void checkStatus() {
         String wifiState, aprsisState;
         if (WiFi.status() == WL_CONNECTED) {
-            wifiState = "OK"; 
+            wifiState = "OK";
         } else {
-            wifiState = "AP";
-            if (!Config.display.alwaysOn) {
-                display_toggle(true);
-            }
-            lastScreenOn = millis();
-        }
-        if (espClient.connected()) {
-            aprsisState = "OK"; 
-        } else {
-            aprsisState = "--";
-            if (!Config.display.alwaysOn) {
-                display_toggle(true);
-            }
-            lastScreenOn = millis();
-        }
-        secondLine = "WiFi: " + wifiState + "  APRS-IS: " + aprsisState;
-    }
-
-    String createPacket(String packet) {
-        if (stationMode>1) {
-            return packet.substring(3, packet.indexOf(":")) + ",qAR," + Config.callsign + packet.substring(packet.indexOf(":"));// + "\n";
-        } else {
-            return packet.substring(3, packet.indexOf(":")) + ",qAO," + Config.callsign + packet.substring(packet.indexOf(":"));// + "\n";
-        }
-    }
-
-    void processLoRaPacket(String packet) {
-        bool queryMessage = false;
-        String aprsPacket, Sender, AddresseeAndMessage, Addressee, ackMessage, receivedMessage;
-        if (packet != "") {
-            #ifdef TextSerialOutputForApp
-            Serial.println(packet.substring(3));
-            #else
-            Serial.print("Received Lora Packet   : " + String(packet));
-            #endif    
-            if ((packet.substring(0,3) == "\x3c\xff\x01") && (packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
-                #ifndef TextSerialOutputForApp
-                Serial.print("   ---> APRS LoRa Packet!");
-                #endif
-                Sender = packet.substring(3,packet.indexOf(">"));
-                if (Sender != Config.callsign) {   // avoid listening yourself by digirepeating
-                    AddresseeAndMessage = packet.substring(packet.indexOf("::")+2);  
-                    Addressee = AddresseeAndMessage.substring(0,AddresseeAndMessage.indexOf(":"));
-                    Addressee.trim();
-
-                    if (stationMode!=1 && Config.igateRepeatsLoRaPackets && Addressee != Config.callsign) { // if its not for me
-                        String digiRepeatedPacket = DIGI_Utils::generateDigiRepeatedPacket(packet.substring(3), Config.callsign);
-                        if (digiRepeatedPacket != "X") {
-                            delay(500);
-                            LoRa_Utils::sendNewPacket("APRS", digiRepeatedPacket);
-                        }
-                    }
-                    
-                    if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!                     
-                        if (AddresseeAndMessage.indexOf("{")>0) {     // ack?
-                            ackMessage = "ack" + AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{")+1);
-                            ackMessage.trim();
-                            delay(4000);
-                            //Serial.println(ackMessage);
-                            for(int i = Sender.length(); i < 9; i++) {
-                                Sender += ' ';
-                            }
-                            LoRa_Utils::sendNewPacket("APRS", Config.callsign + ">APLRG1,RFONLY,WIDE1-1::" + Sender + ":" + ackMessage);
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
-                        } else {
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
-                        }
-                        if (receivedMessage.indexOf("?") == 0) {
-                            queryMessage = true;
-                            delay(2000);
-                            if (!Config.display.alwaysOn) {
-                                display_toggle(true);
-                            }
-                            LoRa_Utils::sendNewPacket("APRS", QUERY_Utils::process(receivedMessage, Sender, "LoRa"));
-                            lastScreenOn = millis();
-                            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + Sender, "TYPE --> QUERY",  0);
-                        }
-                    }
-                    if (!queryMessage) {
-                        aprsPacket = createPacket(packet);
-                        if (!Config.display.alwaysOn) {
-                            display_toggle(true);
-                        }
-                        lastScreenOn = millis();
-                        upload(aprsPacket);
-                        #ifndef TextSerialOutputForApp
-                        Serial.println("   ---> Uploaded to APRS-IS");
-                        #endif
-                        STATION_Utils::updateLastHeard(Sender);
-                        Utils::typeOfPacket(aprsPacket, "LoRa-APRS");
-                        show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-                    }
-                }    
+            if (backUpDigiMode || Config.digi.ecoMode) {
+                wifiState = "--";
             } else {
-                #ifndef TextSerialOutputForApp
-                Serial.println("   ---> LoRa Packet Ignored (first 3 bytes or TCPIP/NOGATE/RFONLY)\n");
-                #endif
+                wifiState = "AP";
+            }            
+            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
+            }
+            lastScreenOn = millis();
+        }
+
+        if (!Config.aprs_is.active) {
+            aprsisState = "OFF";
+        } else {
+            #ifdef HAS_A7670
+                if (modemLoggedToAPRSIS) {
+                    aprsisState = "OK";
+                } else {
+                    aprsisState = "--";
+                }
+            #else
+                if (espClient.connected()) {
+                    aprsisState = "OK";
+                } else {
+                    aprsisState = "--";
+                }
+            #endif
+            if(aprsisState == "--" && !Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
+                lastScreenOn = millis();
+            }
+        }
+        secondLine = "WiFi: ";
+        secondLine += wifiState;
+        secondLine += " APRS-IS: ";
+        secondLine += aprsisState;
+    }
+
+    String checkForStartingBytes(const String& packet) {
+        if (packet.indexOf("\x3c\xff\x01") != -1) {
+            return packet.substring(0, packet.indexOf("\x3c\xff\x01"));
+        } else {
+            return packet;
+        }
+    }
+
+    String buildPacketToUpload(const String& packet) {
+        String buildedPacket = packet.substring(3, packet.indexOf(":"));
+        if (!(Config.aprs_is.active && Config.digi.mode == 0)) { // Check if NOT only IGate
+            buildedPacket += ",qAR,";
+        } else {
+            buildedPacket += ",qAO,";
+        }
+        buildedPacket += Config.callsign;
+        buildedPacket += checkForStartingBytes(packet.substring(packet.indexOf(":")));
+        return buildedPacket;
+    }
+
+    bool processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty) {
+        String receivedMessage;
+        if (packet.indexOf("{") > 0) {     // ack?
+            String ackMessage = "ack";
+            ackMessage.concat(packet.substring(packet.indexOf("{") + 1));
+            ackMessage.trim();
+            //Serial.println(ackMessage);
+            
+            String addToBuffer = Config.callsign;
+            addToBuffer += ">APLRG1";
+            if (!thirdParty) addToBuffer += ",RFONLY";
+            if (Config.beacon.path != "") {
+                addToBuffer += ",";
+                addToBuffer += Config.beacon.path;
+            }
+            addToBuffer += "::";
+
+            String processedSender = sender;
+            for (int i = sender.length(); i < 9; i++) {
+                processedSender += ' ';
+            }
+            addToBuffer += processedSender;
+
+            addToBuffer += ":";
+            addToBuffer += ackMessage;
+            STATION_Utils::addToOutputPacketBuffer(addToBuffer);
+            receivedMessage = packet.substring(packet.indexOf(":") + 1, packet.indexOf("{"));
+        } else {
+            receivedMessage = packet.substring(packet.indexOf(":") + 1);
+        }
+        if (receivedMessage.indexOf("?") == 0) {
+            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                displayToggle(true);
+            }
+            STATION_Utils::addToOutputPacketBuffer(QUERY_Utils::process(receivedMessage, sender, false, thirdParty));
+            lastScreenOn = millis();
+            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + sender, "TYPE --> QUERY", 0);
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    void processLoRaPacket(const String& packet) {
+        if (passcodeValid && (espClient.connected() || modemLoggedToAPRSIS)) {
+            if (packet.indexOf("NOGATE") == -1 && packet.indexOf("RFONLY") == -1) {
+                int firstColonIndex = packet.indexOf(":");
+                if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
+                    const String& Sender = packet.substring(3, packet.indexOf(">"));
+                    if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
+                        STATION_Utils::updateLastHeard(Sender);
+                        Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
+                        const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                        String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                        Addressee.trim();
+                        bool queryMessage = false;
+                        if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
+                            queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage), false);
+                        }
+                        if (!queryMessage) {
+                            const String& aprsPacket = buildPacketToUpload(packet);
+                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                                displayToggle(true);
+                            }
+                            lastScreenOn = millis();
+                            #ifdef HAS_A7670
+                                stationBeacon = true;
+                                A7670_Utils::uploadToAPRSIS(aprsPacket);
+                                stationBeacon = false;
+                            #else
+                                upload(aprsPacket);
+                            #endif
+                            Utils::println("---> Uploaded to APRS-IS");
+                            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                        }
+                    }
+                }
             }
         }
     }
 
-    void processAPRSISPacket(String packet) {
-        String Sender, AddresseeAndMessage, Addressee, receivedMessage;
-        if (!packet.startsWith("#")){
-            if (packet.indexOf("::")>0) {
-                Sender = packet.substring(0,packet.indexOf(">"));
-                AddresseeAndMessage = packet.substring(packet.indexOf("::")+2);
-                Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+    String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
+        String packet = aprsisPacket;
+        packet.trim();
+        String outputPacket = Config.callsign;
+        outputPacket += ">APLRG1";
+        if (Config.beacon.path != "") {
+            outputPacket += ",";
+            outputPacket += Config.beacon.path;
+        }
+        outputPacket += ":}";
+        outputPacket += packet.substring(0, packet.indexOf(",")); // Callsign>Tocall
+        outputPacket.concat(",TCPIP,");
+        outputPacket.concat(Config.callsign);
+        outputPacket.concat("*");
+        switch (packetType) {
+            case 0: // gps
+                if (packet.indexOf(":=") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":="));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":!"));
+                }
+                break;
+            case 1: // messages
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 2: // status
+                outputPacket += packet.substring(packet.indexOf(":>"));
+                break;
+            case 3: // telemetry
+                outputPacket += packet.substring(packet.indexOf("::"));
+                break;
+            case 4: // mic-e
+                if (packet.indexOf(":`") > 0) {
+                    outputPacket += packet.substring(packet.indexOf(":`"));
+                } else {
+                    outputPacket += packet.substring(packet.indexOf(":'"));
+                }
+                break;
+            case 5: // object
+                outputPacket += packet.substring(packet.indexOf(":;"));
+                break;
+        }
+        return outputPacket;
+    }
+
+    void processAPRSISPacket(const String& packet) {
+        if (!passcodeValid && packet.indexOf(Config.callsign) != -1) {
+            if (packet.indexOf("unverified") != -1 ) {
+                Serial.println("\n****APRS PASSCODE NOT VALID****\n");
+                displayShow(firstLine, "", "    APRS PASSCODE", "    NOT VALID !!!", "", "", "", 0);
+                while (1) {};
+            } else if (packet.indexOf("verified") != -1 ) {
+                passcodeValid = true;
+            }
+        }
+        if (passcodeValid && !packet.startsWith("#")) {
+            if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
+                String Sender = packet.substring(0, packet.indexOf(">"));
+                const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                 Addressee.trim();
-                if (Addressee == Config.callsign) {             // its for me!
-                    if (AddresseeAndMessage.indexOf("{")>0) {     // ack?
-                        String ackMessage = "ack" + AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{")+1);
+                if (Addressee == Config.callsign) {                 // its for me!
+                    String receivedMessage;
+                    if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
+                        String ackMessage = "ack";
+                        ackMessage += AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
                         ackMessage.trim();
                         delay(4000);
-                        //Serial.println(ackMessage);
-                        for(int i = Sender.length(); i < 9; i++) {
+                        for (int i = Sender.length(); i < 9; i++) {
                             Sender += ' ';
                         }
-                        String ackPacket = Config.callsign + ">APLRG1,TCPIP,qAC::" + Sender + ":" + ackMessage;// + "\n";
-                        upload(ackPacket);
-                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
+
+                        String ackPacket = Config.callsign;
+                        ackPacket += ">APLRG1,TCPIP,qAC::";
+                        ackPacket += Sender;
+                        ackPacket += ":";
+                        ackPacket += ackMessage;
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(ackPacket);
+                        #else
+                            upload(ackPacket);
+                        #endif
+                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
                     } else {
-                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
+                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
                     }
                     if (receivedMessage.indexOf("?") == 0) {
-                        #ifndef TextSerialOutputForApp
-                        Serial.println("Received Query APRS-IS : " + packet);
-                        #endif
-                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, "APRSIS");
+                        Utils::println("Rx Query (APRS-IS)  : " + packet);
+                        Sender.trim();
+                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
                         //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
-                        if (!Config.display.alwaysOn) {
-                            display_toggle(true);
+                        if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                            displayToggle(true);
                         }
                         lastScreenOn = millis();
                         delay(500);
-                        upload(queryAnswer);
-                        SYSLOG_Utils::log("APRSIS Tx", queryAnswer,0,0,0);
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(queryAnswer);
+                        #else
+                            upload(queryAnswer);
+                        #endif
+                        SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
                         fifthLine = "APRS-IS ----> APRS-IS";
                         sixthLine = Config.callsign;
-                        for (int j=sixthLine.length();j<9;j++) {
+                        for (int j = sixthLine.length();j < 9;j++) {
                             sixthLine += " ";
                         }
-                        sixthLine += "> " + Sender;
-                        seventhLine = "QUERY = " + receivedMessage;
+                        sixthLine += "> ";
+                        sixthLine += Sender;
+                        seventhLine = "QUERY = ";
+                        seventhLine += receivedMessage;
                     }
+                    displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                 } else {
-                    #ifndef TextSerialOutputForApp
-                    Serial.print("Received from APRS-IS  : " + packet);
-                    #endif
-                    if ((stationMode==2 || stationMode==5) && STATION_Utils::wasHeard(Addressee)) {
-                        LoRa_Utils::sendNewPacket("APRS", LoRa_Utils::generatePacket(packet));
-                        display_toggle(true);
+                    Utils::print("Rx Message (APRS-IS): " + packet);
+                    if (STATION_Utils::wasHeard(Addressee) && packet.indexOf("EQNS.") == -1 && packet.indexOf("UNIT.") == -1 && packet.indexOf("PARM.") == -1) {
+                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
+                        displayToggle(true);
                         lastScreenOn = millis();
-                        Utils::typeOfPacket(packet, "APRS-LoRa");
+                        Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                        displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                     }
                 }
-                show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-            }        
+            } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
+                Utils::print("Rx Object (APRS-IS) : " + packet);
+                if (STATION_Utils::checkObjectTime(packet)) {
+                    STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
+                    displayToggle(true);
+                    lastScreenOn = millis();
+                    Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                    Serial.println();
+                } else {
+                    Serial.println(" ---> Rejected (Time): No Tx");
+                }
+            }
         }
     }
 
-    void loop() {
-        checkStatus();
-        show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);    
-        while (espClient.connected()) {
-            Utils::checkDisplayInterval();
-            Utils::checkBeaconInterval();
-            processLoRaPacket(LoRa_Utils::receivePacket());            
-            if (espClient.available()) {
-                String aprsisPacket;
-                aprsisPacket.concat(espClient.readStringUntil('\r'));
-                processAPRSISPacket(aprsisPacket);
+    void listenAPRSIS() {
+        #ifdef HAS_A7670
+            A7670_Utils::listenAPRSIS();
+        #else
+            if (espClient.connected()) {
+                if (espClient.available()) {
+                    String aprsisPacket = espClient.readStringUntil('\r');
+                    aprsisPacket.trim();    // Serial.println(aprsisPacket);
+                    processAPRSISPacket(aprsisPacket);
+                    lastRxTime = millis();
+                }
+            }
+        #endif
+    }
+
+    void firstConnection() {
+        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+            connect();
+            while (!passcodeValid) {
+                listenAPRSIS();
             }
-            ElegantOTA.loop();
         }
     }
 

src/aprs_is_utils.h

@@ -1,26 +0,0 @@
-#ifndef APRS_IS_UTILS_H_
-#define APRS_IS_UTILS_H_
-
-#include <Arduino.h>
-
-
-//#define TextSerialOutputForApp
-/*  uncomment the previous line to get text from Serial-Output over USB into PC for:
-    - PinPoint App ( https://www.pinpointaprs.com )
-    - APRSIS32 App ( http://aprsisce.wikidot.com )
-*/
-
-
-namespace APRS_IS_Utils {
-
-    void upload(String line);
-    void connect();
-    void checkStatus();
-    String createPacket(String unprocessedPacket);
-    void processLoRaPacket(String packet);
-    void processAPRSISPacket(String packet);
-    void loop();
-
-}
-
-#endif

src/battery_utils.cpp

@@ -1,46 +1,267 @@
+#include <Arduino.h>
 #include "battery_utils.h"
 #include "configuration.h"
-#include "pins_config.h"
+#include "board_pinout.h"
+#include "power_utils.h"
+#include "utils.h"
 
-extern Configuration    Config;
 
-float adcReadingTransformation = (3.3/4095);
-float voltageDividerCorrection = 0.288;
+extern  Configuration                   Config;
+extern  uint32_t                        lastBatteryCheck;
 
-// for External Voltage Measurment (MAX = 15Volts !!!)
-float R1 = 100.000; //in Kilo-Ohms
-float R2 = 27.000; //in Kilo-Ohms
-float readingCorrection = 0.125;
-float multiplyCorrection = 0.035;
+bool    shouldSleepLowVoltage           = false;
+
+float   adcReadingTransformation        = (3.3/4095);
+float   voltageDividerCorrection        = 0.288;
+float   readingCorrection               = 0.125;
+float   multiplyCorrection              = 0.035;
+
+float   voltageDividerTransformation    = 0.0;
+
+int     telemetryCounter                = random(1,999);
+
+
+#ifdef HAS_ADC_CALIBRATION
+    #include <esp_adc_cal.h>
+
+    #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
+
+    #if CONFIG_IDF_TARGET_ESP32
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_VREF
+    #elif CONFIG_IDF_TARGET_ESP32S2
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP
+    #elif CONFIG_IDF_TARGET_ESP32C3
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP
+    #elif CONFIG_IDF_TARGET_ESP32S3
+    #define ADC_EXAMPLE_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP_FIT
+    #endif
+
+    esp_adc_cal_characteristics_t adc_chars;
+#endif
+
+bool calibrationEnable = false;
 
 
 namespace BATTERY_Utils {
 
-    float checkBattery() { 
-        int sample;
-        int sampleSum = 0;
-        for (int i=0; i<100; i++) {
-            #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2)
-            sample = analogRead(batteryPin);
+    float mapVoltage(float voltage, float in_min, float in_max, float out_min, float out_max) {
+        return (voltage - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+    }
+
+    void adcCalibration() {
+        #ifdef HAS_ADC_CALIBRATION
+            if (calibrationEnable) {
+                adc1_config_width(ADC_WIDTH_BIT_12);
+                adc1_config_channel_atten(InternalBattery_ADC_Channel, ADC_ATTEN_DB_12);
+                adc1_config_channel_atten(ExternalVoltage_ADC_Channel, ADC_ATTEN_DB_12);
+            }
+        #endif
+    }
+
+    void adcCalibrationCheck() {
+        #ifdef HAS_ADC_CALIBRATION
+            esp_err_t ret;
+            ret = esp_adc_cal_check_efuse(ADC_EXAMPLE_CALI_SCHEME);
+            /*if (ret == ESP_ERR_NOT_SUPPORTED) {
+                Serial.println("Calibration scheme not supported, skip software calibration");
+            } else if (ret == ESP_ERR_INVALID_VERSION) {
+                Serial.println("eFuse not burnt, skip software calibration");
+            } else */
+            if (ret == ESP_OK) {
+                esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_12, ADC_WIDTH_BIT_12, 1100, &adc_chars);
+                //Serial.printf("eFuse Vref:%u mV\n", adc_chars.vref);
+                calibrationEnable = true;
+            } /*else {
+                Serial.println("Invalid Calibration Arg");
+            }*/
+        #endif
+    }
+
+    void setup() {
+        if ((Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) && Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;
+
+        #if defined(HAS_ADC_CALIBRATION)
+            if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage || Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
+                adcCalibrationCheck();
+                adcCalibration();
+            }
+        #endif
+    }
+
+    float checkInternalVoltage() { 
+        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
+            if(POWER_Utils::isBatteryConnected()) {
+                return POWER_Utils::getBatteryVoltage();
+            } else {
+                return 0.0;
+            }
+        #else
+            int sample;
+            int sampleSum = 0;
+            #ifdef ADC_CTRL
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                    digitalWrite(ADC_CTRL, HIGH);
+                #endif
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                    digitalWrite(ADC_CTRL, LOW);
+                #endif
             #endif
-            #if defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-            sample = 0;
+
+            for (int i = 0; i < 100; i++) {
+                #if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
+                    sample = 0;
+                #else
+                    #ifdef HAS_ADC_CALIBRATION
+                        if (calibrationEnable){
+                            sample = adc1_get_raw(InternalBattery_ADC_Channel);
+                        } else {
+                            sample = analogRead(BATTERY_PIN);
+                        }
+                    #else
+                        #ifdef BATTERY_PIN
+                            sample = analogRead(BATTERY_PIN);
+                        #else
+                            sample = 0;
+                        #endif
+                    #endif
+                #endif
+                sampleSum += sample;
+                delayMicroseconds(50); 
+            }
+
+            #ifdef ADC_CTRL
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
+                    digitalWrite(ADC_CTRL, LOW);
+                #endif
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
+                    digitalWrite(ADC_CTRL, HIGH);
+                #endif
+
+                #ifdef HELTEC_WP
+                double inputDivider = (1.0 / (10.0 + 10.0)) * 10.0;  // The voltage divider is a 10k + 10k resistor in series
+                #else
+                double inputDivider = (1.0 / (390.0 + 100.0)) * 100.0;  // The voltage divider is a 390k + 100k resistor in series, 100k on the low side.
+                #endif
+                return (((sampleSum/100) * adcReadingTransformation) / inputDivider) + 0.285; // Yes, this offset is excessive, but the ADC on the ESP32s3 is quite inaccurate and noisy. Adjust to own measurements.
+            #else
+                #ifdef HAS_ADC_CALIBRATION
+                    if (calibrationEnable){
+                        float voltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars);
+                        voltage *= 2;       // for 100K/100K voltage divider
+                        voltage /= 1000;
+                        return voltage;
+                    } else {
+                        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                    }
+                #else
+                    return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;  // raw voltage without mapping
+                #endif
             #endif
-            sampleSum += sample;
-            delayMicroseconds(50); 
-        }
-        return (2 * (sampleSum/100) * adcReadingTransformation) + voltageDividerCorrection;
+            // return mapVoltage(voltage, 3.34, 4.71, 3.0, 4.2); // mapped voltage
+        #endif
     }
 
     float checkExternalVoltage() {
         int sample;
         int sampleSum = 0;
-        for (int i=0; i<100; i++) {
-            sample = analogRead(Config.externalVoltagePin);
+        for (int i = 0; i < 100; i++) {
+            #ifdef HAS_ADC_CALIBRATION
+                if (calibrationEnable){
+                    sample = adc1_get_raw(ExternalVoltage_ADC_Channel);
+                } else {
+                    sample = analogRead(Config.battery.externalVoltagePin);
+                }
+            #else
+                sample = analogRead(Config.battery.externalVoltagePin);
+            #endif
             sampleSum += sample;
-            delayMicroseconds(50); 
+            delayMicroseconds(50);
         }
-        return ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * ((R1+R2)/R2)) - multiplyCorrection;
+
+        float extVoltage;
+        #ifdef HAS_ADC_CALIBRATION
+            if (calibrationEnable){
+                extVoltage = esp_adc_cal_raw_to_voltage(sampleSum / 100, &adc_chars) * voltageDividerTransformation; // in mV
+                extVoltage /= 1000;
+            } else {
+                extVoltage = ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * voltageDividerTransformation) - multiplyCorrection;
+            }
+        #else
+            extVoltage = ((((sampleSum/100)* adcReadingTransformation) + readingCorrection) * voltageDividerTransformation) - multiplyCorrection;
+        #endif
+        
+        return extVoltage; // raw voltage without mapping
+
+        // return mapVoltage(voltage, 5.05, 6.32, 4.5, 5.5); // mapped voltage
+    }
+
+    void checkIfShouldSleep() {
+        if (lastBatteryCheck == 0 || millis() - lastBatteryCheck >= 15 * 60 * 1000) {
+            lastBatteryCheck = millis();            
+            if (checkInternalVoltage() < Config.lowVoltageCutOff) {
+                ESP.deepSleep(1800000000); // 30 min sleep (60s = 60e6)
+            }
+        }
+    }
+
+    void startupBatteryHealth() {
+        #ifdef BATTERY_PIN
+            if (Config.battery.monitorInternalVoltage && checkInternalVoltage() < Config.battery.internalSleepVoltage + 0.1) {
+                shouldSleepLowVoltage = true;
+            }
+        #endif
+        #ifndef HELTEC_WP
+            if (Config.battery.monitorExternalVoltage && checkExternalVoltage() < Config.battery.externalSleepVoltage + 0.1) {
+                shouldSleepLowVoltage = true;
+            }
+        #endif
+        if (shouldSleepLowVoltage) {
+            Utils::checkSleepByLowBatteryVoltage(0);
+        }
+    }
+
+    String generateEncodedTelemetryBytes(float value, bool firstBytes, byte voltageType) {  // 0 = internal battery(0-4,2V) , 1 = external battery(0-15V)
+        String encodedBytes;
+        int tempValue;
+
+        if (firstBytes) {
+            tempValue = value;
+        } else {
+            switch (voltageType) {
+                case 0:
+                    tempValue = value * 100;           // Internal voltage calculation
+                    break;
+                case 1:
+                    tempValue = (value * 100) / 2;     // External voltage calculation
+                    break;
+                default:
+                    tempValue = value;
+                    break;
+            }
+        }
+
+        int firstByte   = tempValue / 91;
+        tempValue       -= firstByte * 91;
+
+        encodedBytes    = char(firstByte + 33);
+        encodedBytes    += char(tempValue + 33);
+        return encodedBytes;
+    }
+
+    String generateEncodedTelemetry() {
+        String telemetry = "|";
+        telemetry += generateEncodedTelemetryBytes(telemetryCounter, true, 0);
+        telemetryCounter++;
+        if (telemetryCounter == 1000) {
+            telemetryCounter = 0;
+        }
+        if (Config.battery.sendInternalVoltage) telemetry += generateEncodedTelemetryBytes(checkInternalVoltage(), false, 0);
+        if (Config.battery.sendExternalVoltage) telemetry += generateEncodedTelemetryBytes(checkExternalVoltage(), false, 1);
+        telemetry += "|";
+        return telemetry;
     }
 
 }

src/battery_utils.h

@@ -1,14 +0,0 @@
-#ifndef BATTERY_UTILS_H_
-#define BATTERY_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace BATTERY_Utils {
-
-    float checkBattery();
-    float checkExternalVoltage();
-
-}
-
-#endif

src/bme_utils.cpp

@@ -1,156 +0,0 @@
-#include "bme_utils.h"
-#include "configuration.h"
-#include "gps_utils.h"
-#include "display.h"
-
-#define SEALEVELPRESSURE_HPA (1013.25)
-#define HEIGHT_CORRECTION 0             // in meters
-#define CORRECTION_FACTOR (8.2296)      // for meters
-
-extern Configuration  Config;
-extern String         fifthLine;
-
-
-namespace BME_Utils {
-
-    #ifdef BME280Sensor
-    Adafruit_BME280   bme;
-    #endif
-    #ifdef BMP280Sensor
-    Adafruit_BMP280   bme;
-    #endif
-    #ifdef BME680Sensor
-    Adafruit_BME680 bme; 
-    #endif
-
-    void setup() {
-        if (Config.bme.active) {
-            bool status;
-            status = bme.begin(0x76);  // Don't forget to join pins for righ direction on BME280!
-            if (!status) {
-                Serial.println("Could not find a valid BME280 or BMP280 sensor, check wiring!");
-                show_display("ERROR", "", "BME/BMP sensor active", "but no sensor found...");
-                while (1); // sacar esto para que quede pegado si no encuentra BME280
-            } else {
-                #ifdef BME280Sensor
-                Serial.println("init : BME280 Module  ...     done!");
-                #endif
-                #ifdef BMP280Sensor
-                Serial.println("init : BMP280 Module  ...     done!");
-                #endif
-                #ifdef BME680Sensor
-                Serial.println("init : BME680 Module  ...     done!");
-                #endif   
-            }
-        } else {
-            Serial.println("(BME/BMP sensor not 'active' in 'igate_conf.json')");
-        }
-    }
-
-    String generateTempString(float bmeTemp) {
-        String strTemp;
-        strTemp = String((int)bmeTemp);
-        switch (strTemp.length()) {
-            case 1:
-                return "00" + strTemp;
-                break;
-            case 2:
-                return "0" + strTemp;
-                break;
-            case 3:
-                return strTemp;
-                break;
-            default:
-                return "-999";
-        }
-    }
-
-    String generateHumString(float bmeHum) {
-        String strHum;
-        strHum = String((int)bmeHum);
-        switch (strHum.length()) {
-            case 1:
-                return "0" + strHum;
-                break;
-            case 2:
-                return strHum;
-                break;
-            case 3:
-                if ((int)bmeHum == 100) {
-                return "00";
-                } else {
-                return "-99";
-                }
-                break;
-            default:
-                return "-99";
-        }
-    }
-
-    String generatePresString(float bmePress) {
-        String strPress;
-        strPress = String((int)bmePress);
-        switch (strPress.length()) {
-            case 1:
-                return "000" + strPress + "0";
-                break;
-            case 2:
-                return "00" + strPress + "0";
-                break;
-            case 3:
-                return "0" + strPress + "0";
-                break;
-            case 4:
-                return strPress + "0";
-                break;
-            case 5:
-                return strPress;
-                break;
-            default:
-                return "-99999";
-        }
-    }
-
-    String readDataSensor() {
-        String wx, tempStr, humStr, presStr;
-        float newHum;
-        
-        float newTemp   = bme.readTemperature();
-        #if defined(BME280Sensor) || defined(BME680Sensor)
-        newHum = bme.readHumidity();
-        #endif
-        #ifdef BMP280Sensor
-        newHum = 0;
-        #endif
-        float newPress  = (bme.readPressure() / 100.0F);
-
-        #ifdef BME680Sensor
-        float newGas = bme.gas_resistance / 1000.0; // in Kilo ohms
-        #endif
-        
-        //bme.readAltitude(SEALEVELPRESSURE_HPA) // this is for approximate Altitude Calculation.
-    
-        if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {
-            Serial.println("BME/BMP Module data failed");
-            wx = ".../...g...t...r...p...P...h..b.....";
-            fifthLine = "";
-            return wx;
-        } else {
-            tempStr = generateTempString((newTemp * 1.8) + 32);
-            #if defined(BME280Sensor) || defined(BME680Sensor)
-            humStr  = generateHumString(newHum);
-            #endif
-            #ifdef BMP280Sensor
-            humStr  = "..";
-            #endif
-            presStr = generatePresString(newPress + (HEIGHT_CORRECTION/CORRECTION_FACTOR));
-            fifthLine = "BME-> " + String(int(newTemp))+"C " + humStr + "% " + presStr.substring(0,4) + "hPa";
-            wx = ".../...g...t" + tempStr + "r...p...P...h" + humStr + "b" + presStr;
-            #ifdef BME680Sensor
-            wx += "Gas: " + String(newGas) + "Kohms ";
-            #endif
-            return wx;
-        }
-    }
-
-}

src/bme_utils.h

@@ -1,33 +0,0 @@
-#ifndef BME_UTILS_H_
-#define BME_UTILS_H_
-
-#include <Arduino.h>
-#include <Adafruit_Sensor.h>
-
-#define BME280Sensor        // its set by default but you should comment it with "//"
-//#define BMP280Sensor      // and delete "//" from the one you want to use.
-//#define BME680Sensor
-
-#ifdef BME280Sensor
-#include <Adafruit_BME280.h>
-#endif
-#ifdef BMP280Sensor
-#include <Adafruit_BMP280.h>
-#endif
-#ifdef BME680Sensor
-#include <Adafruit_BME680.h>
-#endif
-
-
-namespace BME_Utils {
-
-void setup();
-
-    String generateTempString(float bmeTemp);
-    String generateHumString(float bmeHum);
-    String generatePresString(float bmePress);
-    String readDataSensor();
-
-}
-
-#endif

src/configuration.cpp

@@ -7,63 +7,109 @@
 void Configuration::writeFile() {
     Serial.println("Saving config..");
 
-    StaticJsonDocument<1536> data;
+    StaticJsonDocument<2560> data;
     File configFile = SPIFFS.open("/igate_conf.json", "w");
 
     if (wifiAPs[0].ssid != "") { // We don't want to save Auto AP empty SSID
         for (int i = 0; i < wifiAPs.size(); i++) {
             data["wifi"]["AP"][i]["ssid"] = wifiAPs[i].ssid;
             data["wifi"]["AP"][i]["password"] = wifiAPs[i].password;
-            data["wifi"]["AP"][i]["latitude"] = wifiAPs[i].latitude;
-            data["wifi"]["AP"][i]["longitude"] = wifiAPs[i].longitude;
         }
     }
 
-    data["wifi"]["autoAP"]["password"] = wifiAutoAP.password;
-    data["wifi"]["autoAP"]["powerOff"] = wifiAutoAP.powerOff;
+    data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
+    data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
-    data["callsign"] = callsign;
-    data["stationMode"] = stationMode;
-    data["iGateComment"] = iGateComment;
+    data["callsign"]                            = callsign;
 
-    data["other"]["beaconInterval"] = beaconInterval;
-    data["other"]["igateSendsLoRaBeacons"] = igateSendsLoRaBeacons;
-    data["other"]["igateRepeatsLoRaPackets"] = igateRepeatsLoRaPackets;
-    data["other"]["rememberStationTime"] = rememberStationTime;
-    data["other"]["sendBatteryVoltage"] = sendBatteryVoltage;
-    data["other"]["externalVoltageMeasurement"] = externalVoltageMeasurement;
-    data["other"]["externalVoltagePin"] = externalVoltagePin;
+    data["aprs_is"]["active"]                   = aprs_is.active;
+    data["aprs_is"]["passcode"]                 = aprs_is.passcode;
+    data["aprs_is"]["server"]                   = aprs_is.server;
+    data["aprs_is"]["port"]                     = aprs_is.port;
+    data["aprs_is"]["filter"]                   = aprs_is.filter;
+    data["aprs_is"]["messagesToRF"]             = aprs_is.messagesToRF;
+    data["aprs_is"]["objectsToRF"]              = aprs_is.objectsToRF;
 
-    data["digi"]["comment"] = digi.comment;
-    data["digi"]["latitude"] = digi.latitude;
-    data["digi"]["longitude"] = digi.longitude;
+    data["beacon"]["comment"]                   = beacon.comment;
+    data["beacon"]["interval"]                  = beacon.interval;
+    data["beacon"]["latitude"]                  = beacon.latitude;
+    data["beacon"]["longitude"]                 = beacon.longitude;
+    data["beacon"]["overlay"]                   = beacon.overlay;
+    data["beacon"]["symbol"]                    = beacon.symbol;
+    data["beacon"]["sendViaAPRSIS"]             = beacon.sendViaAPRSIS;
+    data["beacon"]["sendViaRF"]                 = beacon.sendViaRF;
+    data["beacon"]["path"]                      = beacon.path;
 
-    data["aprs_is"]["passcode"] = aprs_is.passcode;
-    data["aprs_is"]["server"] = aprs_is.server;
-    data["aprs_is"]["port"] = aprs_is.port;
-    data["aprs_is"]["reportingDistance"] = aprs_is.reportingDistance;
+    data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+    data["beacon"]["gpsAmbiguity"]              = beacon.gpsAmbiguity;
 
-    data["lora"]["iGateFreq"] = loramodule.iGateFreq;
-    data["lora"]["digirepeaterTxFreq"] = loramodule.digirepeaterTxFreq;
-    data["lora"]["digirepeaterRxFreq"] = loramodule.digirepeaterRxFreq;
-    data["lora"]["spreadingFactor"] = loramodule.spreadingFactor;
-    data["lora"]["signalBandwidth"] = loramodule.signalBandwidth;
-    data["lora"]["codingRate4"] = loramodule.codingRate4;
-    data["lora"]["power"] = loramodule.power;
+    data["digi"]["mode"]                        = digi.mode;
+    data["digi"]["ecoMode"]                     = digi.ecoMode;
 
-    data["display"]["alwaysOn"] = display.alwaysOn;
-    data["display"]["timeout"] = display.timeout;
-    data["display"]["turn180"] = display.turn180;
+    data["lora"]["rxFreq"]                      = loramodule.rxFreq;
+    data["lora"]["txFreq"]                      = loramodule.txFreq;
+    data["lora"]["spreadingFactor"]             = loramodule.spreadingFactor;
+    data["lora"]["signalBandwidth"]             = loramodule.signalBandwidth;
+    data["lora"]["codingRate4"]                 = loramodule.codingRate4;
+    data["lora"]["power"]                       = loramodule.power;
+    data["lora"]["txActive"]                    = loramodule.txActive;
+    data["lora"]["rxActive"]                    = loramodule.rxActive;
 
-    data["syslog"]["active"] = syslog.active;
-    data["syslog"]["server"] = syslog.server;
-    data["syslog"]["port"] = syslog.port;
+    data["display"]["alwaysOn"]                 = display.alwaysOn;
+    data["display"]["timeout"]                  = display.timeout;
+    data["display"]["turn180"]                  = display.turn180;
 
-    data["bme"]["active"] = bme.active;
+    data["battery"]["sendInternalVoltage"]      = battery.sendInternalVoltage;
+    data["battery"]["monitorInternalVoltage"]   = battery.monitorInternalVoltage;
+    data["battery"]["internalSleepVoltage"]     = battery.internalSleepVoltage;
+
+    data["battery"]["sendExternalVoltage"]      = battery.sendExternalVoltage;
+    data["battery"]["externalVoltagePin"]       = battery.externalVoltagePin;
+    data["battery"]["monitorExternalVoltage"]   = battery.monitorExternalVoltage;
+    data["battery"]["externalSleepVoltage"]     = battery.externalSleepVoltage;
+    data["battery"]["voltageDividerR1"]         = battery.voltageDividerR1;
+    data["battery"]["voltageDividerR2"]         = battery.voltageDividerR2;
+
+    data["battery"]["sendVoltageAsTelemetry"]   = battery.sendVoltageAsTelemetry;
+
+    data["wxsensor"]["active"]                  = wxsensor.active;
+    data["wxsensor"]["heightCorrection"]        = wxsensor.heightCorrection;
+    data["wxsensor"]["temperatureCorrection"]   = wxsensor.temperatureCorrection;
+
+    data["syslog"]["active"]                    = syslog.active;
+    data["syslog"]["server"]                    = syslog.server;
+    data["syslog"]["port"]                      = syslog.port;
+
+    data["tnc"]["enableServer"]                 = tnc.enableServer;
+    data["tnc"]["enableSerial"]                 = tnc.enableSerial;
+    data["tnc"]["acceptOwn"]                    = tnc.acceptOwn;
+
+    data["other"]["rebootMode"]                 = rebootMode;
+    data["other"]["rebootModeTime"]             = rebootModeTime;
+
+    data["ota"]["username"]                     = ota.username;
+    data["ota"]["password"]                     = ota.password;
+
+    data["other"]["rememberStationTime"]        = rememberStationTime;
+
+    data["other"]["backupDigiMode"]             = backupDigiMode;
+
+    data["other"]["lowPowerMode"]               = lowPowerMode;
+    data["other"]["lowVoltageCutOff"]           = lowVoltageCutOff;
+
+    data["personalNote"]                        = personalNote;
+
+    data["blacklist"]                           = blacklist;
+
+    data["webadmin"]["active"]                  = webadmin.active;
+    data["webadmin"]["username"]                = webadmin.username;
+    data["webadmin"]["password"]                = webadmin.password;
+
+    data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
+
+    data["remoteManagement"]["managers"]        = remoteManagement.managers;
+    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
 
-    data["ota"]["username"] = ota.username;
-    data["ota"]["password"] = ota.password;
-    
     serializeJson(data, configFile);
 
     configFile.close();
@@ -77,7 +123,7 @@ bool Configuration::readFile() {
     File configFile = SPIFFS.open("/igate_conf.json", "r");
 
     if (configFile) {
-        StaticJsonDocument<1536> data;
+        StaticJsonDocument<2560> data;
 
         DeserializationError error = deserializeJson(data, configFile);
         if (error) {
@@ -89,62 +135,106 @@ bool Configuration::readFile() {
             WiFi_AP wifiap;
             wifiap.ssid                   = WiFiArray[i]["ssid"].as<String>();
             wifiap.password               = WiFiArray[i]["password"].as<String>();
-            wifiap.latitude               = WiFiArray[i]["latitude"].as<double>();
-            wifiap.longitude              = WiFiArray[i]["longitude"].as<double>();
 
             wifiAPs.push_back(wifiap);
         }
 
-        wifiAutoAP.password             = data["wifi"]["autoAP"]["password"].as<String>();
-        wifiAutoAP.powerOff             = data["wifi"]["autoAP"]["powerOff"].as<int>();
+        wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
+        wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;
 
-        callsign                        = data["callsign"].as<String>();
-        stationMode                     = data["stationMode"].as<int>();
-        iGateComment                    = data["iGateComment"].as<String>();
-        beaconInterval                  = data["other"]["beaconInterval"].as<int>();
-        igateSendsLoRaBeacons           = data["other"]["igateSendsLoRaBeacons"].as<bool>();
-        igateRepeatsLoRaPackets         = data["other"]["igateRepeatsLoRaPackets"].as<bool>();
-        rememberStationTime             = data["other"]["rememberStationTime"].as<int>();
-        sendBatteryVoltage              = data["other"]["sendBatteryVoltage"].as<bool>();
-        externalVoltageMeasurement      = data["other"]["externalVoltageMeasurement"].as<bool>();
-        externalVoltagePin              = data["other"]["externalVoltagePin"].as<int>();
+        callsign                        = data["callsign"] | "NOCALL-10";
+        rememberStationTime             = data["other"]["rememberStationTime"] | 30;
 
-        digi.comment                    = data["digi"]["comment"].as<String>();
-        digi.latitude                   = data["digi"]["latitude"].as<double>();
-        digi.longitude                  = data["digi"]["longitude"].as<double>();
+        beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
+        beacon.longitude                = data["beacon"]["longitude"] | 0.0;
+        beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
+        beacon.interval                 = data["beacon"]["interval"] | 15;
+        beacon.overlay                  = data["beacon"]["overlay"] | "L";
+        beacon.symbol                   = data["beacon"]["symbol"] | "a";
+        beacon.path                     = data["beacon"]["path"] | "WIDE1-1";
+        beacon.sendViaAPRSIS            = data["beacon"]["sendViaAPRSIS"] | false;
+        beacon.sendViaRF                = data["beacon"]["sendViaRF"] | false;
 
-        aprs_is.passcode                = data["aprs_is"]["passcode"].as<String>();
-        aprs_is.server                  = data["aprs_is"]["server"].as<String>();
-        aprs_is.port                    = data["aprs_is"]["port"].as<int>();
-        aprs_is.reportingDistance       = data["aprs_is"]["reportingDistance"].as<int>();
+        beacon.gpsActive                = data["beacon"]["gpsActive"] | false;
+        beacon.gpsAmbiguity             = data["beacon"]["gpsAmbiguity"] | false;
 
-        loramodule.iGateFreq            = data["lora"]["iGateFreq"].as<long>();
-        loramodule.digirepeaterTxFreq   = data["lora"]["digirepeaterTxFreq"].as<long>();
-        loramodule.digirepeaterRxFreq   = data["lora"]["digirepeaterRxFreq"].as<long>();
-        loramodule.spreadingFactor      = data["lora"]["spreadingFactor"].as<int>();
-        loramodule.signalBandwidth      = data["lora"]["signalBandwidth"].as<long>();
-        loramodule.codingRate4          = data["lora"]["codingRate4"].as<int>();
-        loramodule.power                = data["lora"]["power"].as<int>();
+        aprs_is.active                  = data["aprs_is"]["active"] | false;
+        aprs_is.passcode                = data["aprs_is"]["passcode"] | "XYZWV";
+        aprs_is.server                  = data["aprs_is"]["server"] | "rotate.aprs2.net";
+        aprs_is.port                    = data["aprs_is"]["port"] | 14580;
+        aprs_is.filter                  = data["aprs_is"]["filter"] | "m/10";
+        aprs_is.messagesToRF            = data["aprs_is"]["messagesToRF"] | false;
+        aprs_is.objectsToRF             = data["aprs_is"]["objectsToRF"] | false;
 
-        display.alwaysOn                = data["display"]["alwaysOn"].as<bool>();
-        display.timeout                 = data["display"]["timeout"].as<int>();
-        display.turn180                 = data["display"]["turn180"].as<bool>();
+        digi.mode                       = data["digi"]["mode"] | 0;
+        digi.ecoMode                    = data["digi"]["ecoMode"] | false;
 
-        syslog.active                   = data["syslog"]["active"].as<bool>();
-        syslog.server                   = data["syslog"]["server"].as<String>();
-        syslog.port                     = data["syslog"]["port"].as<int>();
+        loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
+        loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
+        loramodule.spreadingFactor      = data["lora"]["spreadingFactor"] | 12;
+        loramodule.signalBandwidth      = data["lora"]["signalBandwidth"] | 125000;
+        loramodule.codingRate4          = data["lora"]["codingRate4"] | 5;
+        loramodule.power                = data["lora"]["power"] | 20;
+        loramodule.txActive             = data["lora"]["txActive"] | false;
+        loramodule.rxActive             = data["lora"]["rxActive"] | false;
 
-        bme.active                      = data["bme"]["active"].as<bool>();
+        display.alwaysOn                = data["display"]["alwaysOn"] | true;
+        display.timeout                 = data["display"]["timeout"] | 4;
+        display.turn180                 = data["display"]["turn180"] | false;
 
-        ota.username                    = data["ota"]["username"].as<String>();
-        ota.password                    = data["ota"]["password"].as<String>();
+        battery.sendInternalVoltage     = data["battery"]["sendInternalVoltage"] | false;
+        battery.monitorInternalVoltage  = data["battery"]["monitorInternalVoltage"] | false;
+        battery.internalSleepVoltage    = data["battery"]["internalSleepVoltage"] | 2.9;
+
+        battery.sendExternalVoltage     = data["battery"]["sendExternalVoltage"] | false;
+        battery.externalVoltagePin      = data["battery"]["externalVoltagePin"] | 34;
+        battery.monitorExternalVoltage  = data["battery"]["monitorExternalVoltage"] | false;
+        battery.externalSleepVoltage    = data["battery"]["externalSleepVoltage"] | 10.9;
+        battery.voltageDividerR1        = data["battery"]["voltageDividerR1"] | 100.0;
+        battery.voltageDividerR2        = data["battery"]["voltageDividerR2"] | 27.0;
+
+        battery.sendVoltageAsTelemetry  = data["battery"]["sendVoltageAsTelemetry"] | false;
+
+        wxsensor.active                 = data["wxsensor"]["active"] | false;
+        wxsensor.heightCorrection       = data["wxsensor"]["heightCorrection"] | 0;
+        wxsensor.temperatureCorrection  = data["wxsensor"]["temperatureCorrection"] | 0.0;
+
+        syslog.active                   = data["syslog"]["active"] | false;
+        syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
+        syslog.port                     = data["syslog"]["port"] | 1514;
+
+        tnc.enableServer                = data["tnc"]["enableServer"] | false;
+        tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
+        tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;
+
+        ota.username                    = data["ota"]["username"] | "";
+        ota.password                    = data["ota"]["password"] | "";
+
+        webadmin.active                 = data["webadmin"]["active"] | false;
+        webadmin.username               = data["webadmin"]["username"] | "admin";
+        webadmin.password               = data["webadmin"]["password"] | "";
+
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
+
+        lowPowerMode                    = data["other"]["lowPowerMode"] | false;
+        lowVoltageCutOff                = data["other"]["lowVoltageCutOff"] | 0;
+
+        backupDigiMode                  = data["other"]["backupDigiMode"] | false;
+
+        rebootMode                      = data["other"]["rebootMode"] | false;
+        rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
+
+        personalNote    	            = data["personalNote"] | "personal note here";
+
+        blacklist                       = data["blacklist"] | "station callsign";
+
+        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
+        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
 
         if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
             WiFi_AP wifiap;
             wifiap.ssid = "";
             wifiap.password = "";
-            wifiap.latitude = 0.0;
-            wifiap.longitude = 0.0;
 
             wifiAPs.push_back(wifiap);
         }
@@ -158,59 +248,107 @@ bool Configuration::readFile() {
 }
     
 void Configuration::init() {
+
     WiFi_AP wifiap;
-    wifiap.ssid                   = "";
-    wifiap.password               = "";
-    wifiap.latitude               = 0.0;
-    wifiap.longitude              = 0.0;
+    wifiap.ssid                     = "";
+    wifiap.password                 = "";
+
     wifiAPs.push_back(wifiap);
 
-    wifiAutoAP.password = "1234567890";
-    wifiAutoAP.powerOff = 15;
+    wifiAutoAP.password             = "1234567890";
+    wifiAutoAP.timeout              = 10;
 
-    callsign = "N0CALL";
-    stationMode = 1;
-    iGateComment = "LoRa_APRS_iGate Development";
+    callsign                        = "N0CALL-10";
 
-    digi.comment = "LoRa_APRS_iGate Development";
-    digi.latitude = 0.0;
-    digi.longitude = 0.0;
+    beacon.comment                  = "LoRa APRS";
+    beacon.latitude                 = 0.0;
+    beacon.longitude                = 0.0;
+    beacon.interval                 = 15;
+    beacon.overlay                  = "L";
+    beacon.symbol                   = "a";
+    beacon.sendViaAPRSIS            = true;
+    beacon.sendViaRF                = false;
+    beacon.path                     = "WIDE1-1";
 
-    aprs_is.passcode = "XYZVW";
-    aprs_is.server = "rotate.aprs2.net";
-    aprs_is.port = 14580;
-    aprs_is.reportingDistance = 30;
+    beacon.gpsActive                = false;
+    beacon.gpsAmbiguity             = false;
 
-    loramodule.iGateFreq = 433775000;
-    loramodule.digirepeaterTxFreq = 433775000;
-    loramodule.digirepeaterRxFreq = 433900000;
-    loramodule.spreadingFactor = 12;
-    loramodule.signalBandwidth = 125000;
-    loramodule.codingRate4 = 5;
-    loramodule.power = 20;
+    digi.mode                       = 0;
+    digi.ecoMode                    = false;
 
-    display.alwaysOn = true;
-    display.timeout = 4;
-    display.turn180 = false;
+    tnc.enableServer                = false;
+    tnc.enableSerial                = false;
+    tnc.acceptOwn                   = false;
 
-    syslog.active = false;
-    syslog.server = "192.168.0.100";
-    syslog.port = 514;
+    aprs_is.active                  = false;
+    aprs_is.passcode                = "XYZVW";
+    aprs_is.server                  = "rotate.aprs2.net";
+    aprs_is.port                    = 14580;
+    aprs_is.filter                  = "m/10";
+    aprs_is.messagesToRF            = false;
+    aprs_is.objectsToRF             = false;
 
-    bme.active = false;
+    loramodule.txFreq               = 433775000;
+    loramodule.rxFreq               = 433775000;
+    loramodule.spreadingFactor      = 12;
+    loramodule.signalBandwidth      = 125000;
+    loramodule.codingRate4          = 5;
+    loramodule.power                = 20;
+    loramodule.txActive             = false;
+    loramodule.rxActive             = true;
 
-    ota.username = "";
-    ota.password = "";
+    display.alwaysOn                = true;
+    display.timeout                 = 4;
+    display.turn180                 = false;
 
-    beaconInterval = 15;
-    igateSendsLoRaBeacons = false;
-    igateRepeatsLoRaPackets = false;
-    rememberStationTime = 30;
-    sendBatteryVoltage = false;
-    externalVoltageMeasurement = false;
-    externalVoltagePin = 34;
+    syslog.active                   = false;
+    syslog.server                   = "lora.link9.net";
+    syslog.port                     = 1514;
 
-    Serial.println("todo escrito");
+    wxsensor.active                 = false;
+    wxsensor.heightCorrection       = 0;
+    wxsensor.temperatureCorrection  = 0.0;
+
+    ota.username                    = "";
+    ota.password                    = "";
+
+    rememberStationTime             = 30;
+
+    battery.sendInternalVoltage     = false;
+    battery.monitorInternalVoltage  = false;
+    battery.internalSleepVoltage    = 2.9;
+
+    battery.sendExternalVoltage     = false;
+    battery.externalVoltagePin      = 34;
+    battery.monitorExternalVoltage  = false;
+    battery.externalSleepVoltage    = 10.9;
+    battery.voltageDividerR1        = 100.0;
+    battery.voltageDividerR2        = 27.0;
+
+    battery.sendVoltageAsTelemetry  = false;
+
+    lowPowerMode                    = false;
+    lowVoltageCutOff                = 0;
+
+    backupDigiMode                  = false;
+
+    rebootMode                      = false;
+    rebootModeTime                  = 0;
+
+    personalNote                    = "";
+
+    blacklist                       = "";
+
+    webadmin.active                 = false;
+    webadmin.username               = "admin";
+    webadmin.password               = "";
+
+    ntp.gmtCorrection               = 0.0;
+
+    remoteManagement.managers       = "";
+    remoteManagement.rfOnly         = true;
+
+    Serial.println("All is Written!");
 }
 
 Configuration::Configuration() {
@@ -218,13 +356,15 @@ Configuration::Configuration() {
         Serial.println("SPIFFS Mount Failed");
         return;
     } else {
-        Serial.println("montado");
+        Serial.println("SPIFFS Mounted");
     }
+
     bool exists = SPIFFS.exists("/igate_conf.json");
     if (!exists) {
         init();
         writeFile();
         ESP.restart();
     }
+
     readFile();
 }

src/configuration.h

@@ -1,108 +0,0 @@
-#ifndef CONFIGURATION_H_
-#define CONFIGURATION_H_
-
-#include <Arduino.h>
-#include <vector>
-#include <FS.h>
-
-class WiFi_AP {
-public:
-    String  ssid;
-    String  password;
-    double  latitude;
-    double  longitude;
-};
-
-class WiFi_Auto_AP {
-public:
-    String  password;
-    int     powerOff;
-};
-
-
-class DIGI {
-public:
-    String  comment;
-    double  latitude;
-    double  longitude;
-};
-
-class APRS_IS {
-public:
-    String  passcode;
-    String  server;
-    int     port;
-    int     reportingDistance;
-};
-
-class LoraModule {
-public:
-    long    iGateFreq;
-    long    digirepeaterTxFreq;
-    long    digirepeaterRxFreq;
-    int     spreadingFactor;
-    long    signalBandwidth;
-    int     codingRate4;
-    int     power;
-};
-
-class Display {
-public:
-    bool    alwaysOn;
-    int     timeout;
-    bool    turn180;
-};
-
-class SYSLOG {
-public:
-    bool    active;
-    String  server;
-    int     port;
-};
-
-class BME {
-public:
-    bool    active;
-};
-
-class OTA {
-public:
-    String  username;
-    String  password;
-};
-
-
-
-
-class Configuration {
-public:
-    String                callsign;  
-    int                   stationMode;
-    String                iGateComment;
-    int                   beaconInterval;
-    bool                  igateSendsLoRaBeacons;
-    bool                  igateRepeatsLoRaPackets;
-    int                   rememberStationTime;
-    bool                  sendBatteryVoltage;
-    bool                  externalVoltageMeasurement;
-    int                   externalVoltagePin;
-    std::vector<WiFi_AP>  wifiAPs;
-    WiFi_Auto_AP          wifiAutoAP;
-    DIGI                  digi;
-    APRS_IS               aprs_is;
-    LoraModule            loramodule;
-    Display               display;
-    SYSLOG                syslog;
-    BME                   bme;
-    OTA                   ota;
-  
-    void init();
-    void writeFile();
-    Configuration();
-
-private:
-    bool readFile();
-    String _filePath;
-};
-
-#endif

src/digi_utils.cpp

@@ -2,17 +2,16 @@
 #include "configuration.h"
 #include "station_utils.h"
 #include "aprs_is_utils.h"
-#include "lora_utils.h"
 #include "digi_utils.h"
 #include "wifi_utils.h"
+#include "lora_utils.h"
 #include "gps_utils.h"
 #include "display.h"
 #include "utils.h"
 
+
 extern Configuration    Config;
-extern int              stationMode;
 extern uint32_t         lastScreenOn;
-extern int              lastStationModeState;
 extern String           iGateBeaconPacket;
 extern String           firstLine;
 extern String           secondLine;
@@ -21,94 +20,153 @@ extern String           fourthLine;
 extern String           fifthLine;
 extern String           sixthLine;
 extern String           seventhLine;
+extern bool             backUpDigiMode;
 
 
 namespace DIGI_Utils {
 
-    String generateDigiRepeatedPacket(String packet, String callsign) {
-        String sender, temp0, tocall, path;
-        sender = packet.substring(0,packet.indexOf(">"));
-        temp0 = packet.substring(packet.indexOf(">")+1,packet.indexOf(":"));
-        if (temp0.indexOf(",") > 2) {
-            tocall = temp0.substring(0,temp0.indexOf(","));
-            path = temp0.substring(temp0.indexOf(",")+1,temp0.indexOf(":"));
-            if (path.indexOf("WIDE1-")>=0) {
-                String hop = path.substring(path.indexOf("WIDE1-")+6, path.indexOf("WIDE1-")+7);
-                if (hop.toInt()>=1 && hop.toInt()<=7) {
-                    if (hop.toInt()==1) {
-                        path.replace("WIDE1-1", callsign + "*");
-                    } else {
-                        path.replace("WIDE1-" + hop , callsign + "*,WIDE1-" + String(hop.toInt()-1));
-                    }
-                    String repeatedPacket = sender + ">" + tocall + "," + path + packet.substring(packet.indexOf(":"));
-                    return repeatedPacket;
+    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
+        if (!crossFreq) {
+            String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
+            String tempPath = path;
+
+            if (path.indexOf("WIDE1-1") != -1 && (Config.digi.mode == 2 || Config.digi.mode == 3)) {
+                tempPath.replace("WIDE1-1", Config.callsign + "*");
+            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
+                if (path.indexOf(",WIDE1*") != -1) {
+                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
+                }
+                if (path.indexOf("*") != -1) {
+                    tempPath.remove(path.indexOf("*"), 1);
+                }
+                if (path.indexOf("WIDE2-1") != -1) {
+                    tempPath.replace("WIDE2-1", Config.callsign + "*");
+                } else if (path.indexOf("WIDE2-2") != -1) {
+                    tempPath.replace("WIDE2-2", Config.callsign + "*,WIDE2-1");
                 } else {
-                    return "X";
+                    return "";
                 }
-            } else {
-                return "X";
             }
+            packetToRepeat += tempPath;
+            if (thirdParty) {
+                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":}")));
+            } else {
+                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":")));
+            }
+            return packetToRepeat;
+        } else {   // CrossFreq Digipeater
+            String suffix = thirdParty ? ":}" : ":";
+            String packetToRepeat = packet.substring(0, packet.indexOf(suffix));
+            
+            String terms[] = {",WIDE1*", ",WIDE2*", "*"};
+            for (String term : terms) {
+                int index = packetToRepeat.indexOf(term);
+                if (index != -1) {
+                    packetToRepeat.remove(index, term.length());
+                }
+            }
+            packetToRepeat += ",";
+            packetToRepeat += Config.callsign;
+            packetToRepeat += "*";
+            packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(suffix)));
+            return packetToRepeat;
+        }
+    }
+
+    String generateDigipeatedPacket(const String& packet, bool thirdParty){
+        String temp;
+        if (thirdParty) { // only header is used
+            const String& header = packet.substring(0, packet.indexOf(":}"));
+            temp = header.substring(header.indexOf(">") + 1);
         } else {
-            return "X";
+            temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
         }
-    }
+        if (temp.indexOf(",") > 2) { // checks for path
+            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
+            if (Config.digi.mode == 2 || backUpDigiMode) {
+                if (path.indexOf("WIDE1-1") != - 1) {
+                    return buildPacket(path, packet, thirdParty, false);
+                } else if (path.indexOf("WIDE1-1") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { //  CrossFreq Digi
+                    return buildPacket(path, packet, thirdParty, true);
+                } else {
+                    return "";
+                }
+            } else if (Config.digi.mode == 3) {
+                if (path.indexOf("WIDE1-1") != -1 || path.indexOf("WIDE2-") != -1) {
+                    int wide1Index = path.indexOf("WIDE1-1");
+                    int wide2Index = path.indexOf("WIDE2-");
 
-    void processPacket(String packet) {
-        String loraPacket;
-        if (packet != "") {
-            Serial.print("Received Lora Packet   : " + String(packet));
-            if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1)) {
-                Serial.println("   ---> APRS LoRa Packet");
-                String sender = packet.substring(3,packet.indexOf(">"));
-                STATION_Utils::updateLastHeard(sender);
-                STATION_Utils::updatePacketBuffer(packet);
-                Utils::typeOfPacket(packet, "Digi");
-                if ((stationMode==3 || stationMode==5) && (packet.indexOf("WIDE1-") > 10)) {
-                    loraPacket = generateDigiRepeatedPacket(packet.substring(3), Config.callsign);
-                    if (loraPacket != "X") {
-                        delay(500);
-                        Serial.println(loraPacket);
-                        LoRa_Utils::sendNewPacket("APRS", loraPacket);
-                        display_toggle(true);
-                        lastScreenOn = millis();
+                    // WIDE1-1 && WIDE2-n   /   only WIDE1-1    /   only WIDE2-n
+                    if ((wide1Index != -1 && wide2Index != -1 && wide1Index < wide2Index) || (wide1Index != -1 && wide2Index == -1) || (wide1Index == -1 && wide2Index != -1)) {
+                        return buildPacket(path, packet, thirdParty, false);
                     }
-                } else if (stationMode==4){
-                    if (packet.indexOf("WIDE1-") == -1) {
-                        loraPacket = packet.substring(3,packet.indexOf(":")) + "," + Config.callsign + "*" + packet.substring(packet.indexOf(":"));
-                    } else {
-                        loraPacket = packet.substring(3,packet.indexOf(",")+1) + Config.callsign + "*" + packet.substring(packet.indexOf(","));
-                    }
-                    delay(500);
-                    if (stationMode==4) {
-                        LoRa_Utils::changeFreqTx();
-                    }
-                    LoRa_Utils::sendNewPacket("APRS", loraPacket);
-                    if (stationMode==4) {
-                        LoRa_Utils::changeFreqRx();
-                    }
-                    display_toggle(true);
-                    lastScreenOn = millis();
+                    return "";
+                } else if (path.indexOf("WIDE1-1") == -1 && path.indexOf("WIDE2-") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {    //  CrossFreq Digi
+                    return buildPacket(path, packet, thirdParty, true);
+                } else {
+                    return "";
                 }
             } else {
-                Serial.println("   ---> LoRa Packet Ignored (first 3 bytes or NOGATE)\n");
+                return "";
+            }
+        } else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
+            return buildPacket("", packet, thirdParty, true);
+        } else {
+            return "";
+        }
+    }
+
+    void processLoRaPacket(const String& packet) {        
+        if (packet.indexOf("NOGATE") == -1) {
+            bool thirdPartyPacket = false;
+            String temp, Sender;
+            int firstColonIndex = packet.indexOf(":");
+            if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] == '}' && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
+                thirdPartyPacket = true;
+                temp    = packet.substring(packet.indexOf(":}") + 2);
+                Sender  = temp.substring(0, temp.indexOf(">"));
+            } else {
+                temp    = packet.substring(3);
+                Sender  = packet.substring(3, packet.indexOf(">"));
+            }
+            if (Sender != Config.callsign) {        // Avoid listening to own packets
+                if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
+                    return;
+                }
+                if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2)) || Config.lowPowerMode) {
+                    STATION_Utils::updateLastHeard(Sender);
+                    Utils::typeOfPacket(temp, 2);    // Digi
+                    bool queryMessage = false;
+                    if (temp.indexOf("::") > 10) {   // it's a message
+                        String AddresseeAndMessage  = temp.substring(temp.indexOf("::") + 2);
+                        String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                        Addressee.trim();
+                        if (Addressee == Config.callsign) {     // it's a message for me!
+                            queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
+                        }
+                    }
+                    if (!queryMessage) {
+                        String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
+                        if (loraPacket != "") {
+                            if (Config.lowPowerMode) {
+                                LoRa_Utils::sendNewPacket(loraPacket);
+                            } else {
+                                STATION_Utils::addToOutputPacketBuffer(loraPacket);
+                            }
+                            displayToggle(true);
+                            lastScreenOn = millis();
+                        }
+                    }
+                }
             }
         }
     }
 
-    void loop() {
-        if (stationMode==3 || stationMode==4 || stationMode==5) {
-            if (lastStationModeState==0 && stationMode==5) {
-                iGateBeaconPacket = GPS_Utils::generateBeacon();
-                lastStationModeState = 1;
-                String Tx = String(Config.loramodule.digirepeaterTxFreq);
-                secondLine = "Rx:" + String(Tx.substring(0,3)) + "." + String(Tx.substring(3,6));
-                secondLine += " Tx:" + String(Tx.substring(0,3)) + "." + String(Tx.substring(3,6));
-                thirdLine = "<<   DigiRepeater  >>";
-            }
-            Utils::checkDisplayInterval();
-            Utils::checkBeaconInterval();
-            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-            processPacket(LoRa_Utils::receivePacket());
+    void checkEcoMode() {
+        if (Config.digi.ecoMode) {
+            Config.display.alwaysOn     = false;
+            Config.display.timeout      = 0;
+            setCpuFrequencyMhz(10);
         }
     }
 

src/digi_utils.h

@@ -1,15 +0,0 @@
-#ifndef DIGI_UTILS_H_
-#define DIGI_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace DIGI_Utils {
-
-    String generateDigiRepeatedPacket(String packet, String callsign);
-    void processPacket(String packet);
-    void loop();
-
-}
-
-#endif

src/display.cpp

@@ -1,165 +1,282 @@
-#include <Adafruit_SSD1306.h>
-#include <Adafruit_GFX.h>
 #include <Wire.h>
 #include "configuration.h"
-#include "pins_config.h"
+#include "board_pinout.h"
 #include "display.h"
 
-Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
 
-extern Configuration Config;
+#ifdef HAS_DISPLAY
+    #ifdef HAS_TFT
+        #include <TFT_eSPI.h>
 
-void setup_display() {
-    Wire.begin(OLED_SDA, OLED_SCL);
+        TFT_eSPI tft = TFT_eSPI(); 
+        TFT_eSprite sprite  = TFT_eSprite(&tft);
 
-    if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { 
-        Serial.println(F("SSD1306 allocation failed"));
-        for(;;); // Don't proceed, loop forever
-    }
-    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();
-    delay(1000);
+        #ifdef HELTEC_WIRELESS_TRACKER
+            #define bigSizeFont     2
+            #define smallSizeFont   1
+            #define lineSpacing     10
+        #endif
+        #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+            #define bigSizeFont     5
+            #define smallSizeFont   2
+            #define lineSpacing     25
+        #endif
+        uint16_t redColor           = 0xc8a2;
+    #else
+        #ifdef HAS_EPAPER
+            #include <heltec-eink-modules.h>
+            #include "Fonts/FreeSansBold9pt7b.h"
+            EInkDisplay_WirelessPaperV1_1 display;
+            String lastEpaperText;
+        #else
+            #include <Adafruit_GFX.h>
+            #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                #include <Adafruit_SH110X.h>
+                Adafruit_SH1106G display(128, 64, &Wire, OLED_RST);
+            #else
+                #include <Adafruit_SSD1306.h>
+                #ifdef HELTEC_WSL_V3_DISPLAY
+                    Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
+                #else
+                    Adafruit_SSD1306 display(128, 64, &Wire, OLED_RST);
+                #endif
+            #endif
+        #endif
+    #endif
+#endif
+    
+extern  Configuration   Config;
+
+bool    displayFound    = false;
+
+void displaySetup() {
+    #ifdef HAS_DISPLAY
+        delay(500);
+        #ifdef HAS_TFT
+            tft.init();
+            tft.begin();
+            if (Config.display.turn180) {
+                    tft.setRotation(3);
+            } else {
+                tft.setRotation(1);
+            }
+            pinMode(TFT_BL, OUTPUT);
+            digitalWrite(TFT_BL, HIGH);
+            tft.setTextFont(0);
+            tft.fillScreen(TFT_BLACK);
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.createSprite(320,240);
+            #else
+                sprite.createSprite(160,80);
+            #endif
+        #else
+            #ifdef HAS_EPAPER
+                display.landscape();
+                display.printCenter("LoRa APRS iGate Initialising...");
+                display.update();
+            #else
+                #ifdef OLED_DISPLAY_HAS_RST_PIN
+                    pinMode(OLED_RST, OUTPUT);
+                    digitalWrite(OLED_RST, LOW);
+                    delay(20);
+                    digitalWrite(OLED_RST, HIGH);
+                #endif
+
+                #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    if (!display.begin(0x3c, false)) {
+                        displayFound = true;
+                        if (Config.display.turn180) display.setRotation(2);
+                        display.clearDisplay();
+                        display.setTextColor(SH110X_WHITE);
+                        display.setTextSize(1);
+                        display.setCursor(0, 0);
+                        display.setContrast(1);
+                        display.display();
+                    }
+                #else
+                    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();
+                    }
+                #endif
+            #endif
+        #endif
+        delay(1000);
+    #endif
 }
 
-void display_toggle(bool toggle) {
-    if (toggle) {
-        display.ssd1306_command(SSD1306_DISPLAYON);
-    } else {
-        display.ssd1306_command(SSD1306_DISPLAYOFF);
-    }
+void displayToggle(bool toggle) {
+    #ifdef HAS_DISPLAY
+        if (toggle) {
+            #ifdef HAS_TFT
+                digitalWrite(TFT_BL, HIGH);
+            #else
+                #ifdef HAS_EPAPER
+                    display.printCenter("EPAPER Display Disabled by toggle...");
+                    display.update();
+                #else
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        if (displayFound) display.oled_command(SH110X_DISPLAYON);
+                    #else
+                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
+                    #endif
+                #endif
+            #endif
+        } else {
+            #ifdef HAS_TFT
+                digitalWrite(TFT_BL, LOW);
+            #else
+                #ifdef HAS_EPAPER
+                    display.printCenter("Enabled EPAPER Display...");
+                    display.update();
+                #else
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        if (displayFound) display.oled_command(SH110X_DISPLAYOFF);
+                    #else
+                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
+                    #endif
+                    
+                #endif
+            #endif
+        }
+    #endif
 }
 
-void show_display(String line1, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, int wait) {
+    #ifdef HAS_DISPLAY
+        const String* const lines[] = {&line1, &line2, &line3};
+        #ifdef HAS_TFT
+            sprite.fillSprite(TFT_BLACK);
+            #if defined(HELTEC_WIRELESS_TRACKER)
+                sprite.fillRect(0, 0, 160, 19, redColor);
+            #endif
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.fillRect(0, 0, 320, 43, redColor);
+            #endif
+            sprite.setTextFont(0);
+            sprite.setTextSize(bigSizeFont);
+            sprite.setTextColor(TFT_WHITE, redColor);
+            sprite.drawString(header, 3, 3);
+
+            sprite.setTextSize(smallSizeFont);
+            sprite.setTextColor(TFT_WHITE, TFT_BLACK);
+
+            for (int i = 0; i < 3; i++) {
+                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
+            }
+
+            sprite.pushSprite(0,0);
+        #else
+            #ifdef HAS_EPAPER
+                display.clearMemory();
+                display.setCursor(5,10);
+                display.setFont(&FreeSansBold9pt7b);
+                display.println(header);
+                display.setFont(NULL);
+                for (int i = 0; i < 3; i++) {
+                    display.setCursor(0, 25 + (14 * i));
+                    display.println(*lines[i]);
+                }
+                display.update();
+            #else
+                if (displayFound) {
+                    display.clearDisplay();
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setTextColor(SH110X_WHITE);
+                    #else
+                        display.setTextColor(WHITE);
+                    #endif
+                    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 defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setContrast(1);
+                    #else
+                        display.ssd1306_command(SSD1306_SETCONTRAST);
+                        display.ssd1306_command(1);
+                    #endif
+                    display.display();
+                }
+            #endif
+        #endif
+        delay(wait);
+    #endif
 }
 
-void show_display(String line1, String line2, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-}
+void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, const String& line6, int wait) {
+    #ifdef HAS_DISPLAY
+        const String* const lines[] = {&line1, &line2, &line3, &line4, &line5, &line6};
+        #ifdef HAS_TFT
+            sprite.fillSprite(TFT_BLACK);
+            #if defined(HELTEC_WIRELESS_TRACKER)
+                sprite.fillRect(0, 0, 160, 19, redColor);
+            #endif
+            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+                sprite.fillRect(0, 0, 320, 43, redColor);
+            #endif
+            sprite.setTextFont(0);
+            sprite.setTextSize(bigSizeFont);
+            sprite.setTextColor(TFT_WHITE, redColor);
+            sprite.drawString(header, 3, 3);
 
-void show_display(String line1, String line2, String line3, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-}
+            sprite.setTextSize(smallSizeFont);
+            sprite.setTextColor(TFT_WHITE, TFT_BLACK);
 
-void show_display(String line1, String line2, String line3, String line4, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-}
+            for (int i = 0; i < 6; i++) {
+                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
+            }
 
-void show_display(String line1, String line2, String line3, String line4, String line5, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.setCursor(0, 32);
-    display.println(line5);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-}
-
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setCursor(0, 8);
-    display.println(line2);
-    display.setCursor(0, 16);
-    display.println(line3);
-    display.setCursor(0, 24);
-    display.println(line4);
-    display.setCursor(0, 32);
-    display.println(line5);
-    display.setCursor(0, 40);
-    display.println(line6);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
-}
-
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, String line7, int wait) {
-    display.clearDisplay();
-    display.setTextColor(WHITE);
-    display.setTextSize(2);
-    display.setCursor(0, 0);
-    display.println(line1);
-    display.setTextSize(1);
-    display.setCursor(0, 16);
-    display.println(line2);
-    display.setCursor(0, 24);
-    display.println(line3);
-    display.setCursor(0, 32);
-    display.println(line4);
-    display.setCursor(0, 40);
-    display.println(line5);
-    display.setCursor(0, 48);
-    display.println(line6);
-    display.setCursor(0, 56);
-    display.println(line7);
-    display.ssd1306_command(SSD1306_SETCONTRAST);
-    display.ssd1306_command(1);
-    display.display();
-    delay(wait);
+            sprite.pushSprite(0,0);
+        #else
+            #ifdef HAS_EPAPER
+                lastEpaperText = header + line1 + line2 + line3 + line4 + line5 + line6;
+                display.clearMemory();
+                display.setCursor(5,10);
+                display.setFont(&FreeSansBold9pt7b);
+                display.println(header);
+                display.setFont(NULL);
+                for (int i = 0; i < 6; i++) {
+                    display.setCursor(0, 25 + (14 * i));
+                    display.println(*lines[i]);
+                }
+                display.update();
+            #else
+                if (displayFound) {
+                    display.clearDisplay();
+                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setTextColor(SH110X_WHITE);
+                    #else
+                        display.setTextColor(WHITE);
+                    #endif
+                    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 defined(TTGO_T_Beam_S3_SUPREME_V3)
+                        display.setContrast(1);
+                    #else
+                        display.ssd1306_command(SSD1306_SETCONTRAST);
+                        display.ssd1306_command(1);
+                    #endif
+                    display.display();
+                }
+            #endif
+        #endif
+        delay(wait);
+    #endif
 }

src/display.h

@@ -1,22 +0,0 @@
-#ifndef DISPLAY_H_
-#define DISPLAY_H_
-
-#include <Arduino.h>
-
-#define SCREEN_WIDTH    128     // OLED display width, in pixels
-#define SCREEN_HEIGHT   64      // OLED display height, in pixels
-#define SCREEN_ADDRESS  0x3C    ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
-
-
-void setup_display();
-void display_toggle(bool toggle);
-
-void show_display(String line1, int wait = 0);
-void show_display(String line1, String line2, int wait = 0);
-void show_display(String line1, String line2, String line3, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, int wait = 0);
-void show_display(String line1, String line2, String line3, String line4, String line5, String line6, String line7, int wait = 0);
-
-#endif

src/gps_utils.cpp

@@ -1,198 +1,240 @@
 #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 WiFi_AP        *currentWiFi;
-extern WiFiClient     espClient;
-extern int            stationMode;
-String                distance;
+#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 {
 
-    String double2string(double n, int ndec) {
-        String r = "";
-        if (n>-1 && n<0) {
-            r = "-";
-        }   
-        int v = n;
-        r += v;
-        r += '.';
-        for (int i=0;i<ndec;i++) {
-            n -= v;
-            n = 10 * abs(n);
-            v = n;
-            r += v;
-        }
-        return r;
+    String getiGateLoRaBeaconPacket() {
+        return iGateLoRaBeaconPacket;
     }
 
-    String processLatitudeAPRS(double lat) {
-        String degrees = double2string(lat,6);
-        String north_south, latitude, convDeg3;
-        float convDeg, convDeg2;
-
-        if (abs(degrees.toFloat()) < 10) {
-            latitude += "0";
+    char *ax25_base91enc(char *s, uint8_t n, uint32_t v) {
+        for(s += n, *s = '\0'; n; n--) {
+            *(--s) = v % 91 + 33;
+            v /= 91;
         }
-        Serial.println(latitude);
-        if (degrees.indexOf("-") == 0) {
-            north_south = "S";
-            latitude += degrees.substring(1,degrees.indexOf("."));
-        } else {
-            north_south = "N";
-            latitude += degrees.substring(0,degrees.indexOf("."));
-        }
-        convDeg = abs(degrees.toFloat()) - abs(int(degrees.toFloat()));
-        convDeg2 = (convDeg * 60)/100;
-        convDeg3 = String(convDeg2,6);
-        latitude += convDeg3.substring(convDeg3.indexOf(".")+1,convDeg3.indexOf(".")+3) + "." + convDeg3.substring(convDeg3.indexOf(".")+3,convDeg3.indexOf(".")+5);
-        latitude += north_south;
-        return latitude;
+        return(s);
     }
 
-    String processLongitudeAPRS(double lon) {
-        String degrees = double2string(lon,6);
-        String east_west, longitude, convDeg3;
-        float convDeg, convDeg2;
-        
-        if (abs(degrees.toFloat()) < 100) {
-            longitude += "0";
-        }
-        if (abs(degrees.toFloat()) < 10) {
-            longitude += "0";
-        }
-        if (degrees.indexOf("-") == 0) {
-            east_west = "W";
-            longitude += degrees.substring(1,degrees.indexOf("."));
-        } else {
-            east_west = "E";
-            longitude += degrees.substring(0,degrees.indexOf("."));
-        }
-        convDeg = abs(degrees.toFloat()) - abs(int(degrees.toFloat()));
-        convDeg2 = (convDeg * 60)/100;
-        convDeg3 = String(convDeg2,6);
-        longitude += convDeg3.substring(convDeg3.indexOf(".")+1,convDeg3.indexOf(".")+3) + "." + convDeg3.substring(convDeg3.indexOf(".")+3,convDeg3.indexOf(".")+5);
-        longitude += east_west;
-        return longitude;
+    float roundToTwoDecimals(float degrees) {
+        return round(degrees * 100) / 100;
     }
 
-    String generateBeacon() {
-        String stationLatitude, stationLongitude, beaconPacket;
-        if (stationMode==1 || stationMode==2 || (stationMode==5 && WiFi.status()==WL_CONNECTED && espClient.connected())) {
-            stationLatitude = processLatitudeAPRS(currentWiFi->latitude);
-            stationLongitude = processLongitudeAPRS(currentWiFi->longitude);
-            beaconPacket = Config.callsign + ">APLRG1,WIDE1-1";
-            if (stationMode!=6) {
-                beaconPacket += ",qAC";
-            }
-            beaconPacket += ":=" + stationLatitude + "L" + stationLongitude;
-            if (stationMode==1) {
-                beaconPacket += "&";
-            } else {
-                beaconPacket += "a";
-            }
-            beaconPacket += Config.iGateComment;
-        } else { //stationMode 3, 4 and 5
-            if (stationMode==5) {
-                stationLatitude = processLatitudeAPRS(currentWiFi->latitude);
-                stationLongitude = processLongitudeAPRS(currentWiFi->longitude);
-            } else {
-                stationLatitude = processLatitudeAPRS(Config.digi.latitude);
-                stationLongitude = processLongitudeAPRS(Config.digi.longitude);
-            }
-            beaconPacket = Config.callsign + ">APLRG1,WIDE1-1:=" + stationLatitude + "L" + stationLongitude + "#" + Config.digi.comment;
+    String encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol) {
+        String encodedData = overlay;
+        uint32_t aprs_lat, aprs_lon;
+
+        float processedLatitude     = latitude;
+        float processedLongitude    = longitude;
+        if (Config.beacon.gpsActive && Config.beacon.gpsAmbiguity) {
+            processedLatitude       = roundToTwoDecimals(latitude);
+            processedLongitude      = roundToTwoDecimals(longitude);
         }
-        return beaconPacket;
+
+        aprs_lat = 900000000 - processedLatitude * 10000000;
+        aprs_lat = aprs_lat / 26 - aprs_lat / 2710 + aprs_lat / 15384615;
+        aprs_lon = 900000000 + processedLongitude * 10000000 / 2;
+        aprs_lon = aprs_lon / 26 - aprs_lon / 2710 + aprs_lon / 15384615;
+
+        String Ns, Ew, helper;
+        if(processedLatitude < 0) { Ns = "S"; } else { Ns = "N"; }
+        if(processedLatitude < 0) { processedLatitude = -processedLatitude; }
+
+        if(processedLongitude < 0) { Ew = "W"; } else { Ew = "E"; }
+        if(processedLongitude < 0) { processedLongitude = -processedLongitude; }
+
+        char helper_base91[] = {"0000\0"};
+        int i;
+        ax25_base91enc(helper_base91, 4, aprs_lat);
+        for (i = 0; i < 4; i++) {
+            encodedData += helper_base91[i];
+        }
+        ax25_base91enc(helper_base91, 4, aprs_lon);
+        for (i = 0; i < 4; i++) {
+            encodedData += helper_base91[i];
+        }
+        encodedData += symbol;
+        encodedData += "  ";
+        encodedData += "\x47";
+        return encodedData;
     }
 
-    String generateiGateLoRaBeacon() {
-        String stationLatitude, stationLongitude, beaconPacket;
-        stationLatitude = processLatitudeAPRS(currentWiFi->latitude);
-        stationLongitude = processLongitudeAPRS(currentWiFi->longitude);
-        beaconPacket = Config.callsign + ">APLRG1,RFONLY:=" + stationLatitude + "L" + stationLongitude;
-        if (Config.bme.active) {
-            beaconPacket += "_";
-        } else {
-            beaconPacket += "a";
+    void generateBeaconFirstPart() {
+        String beaconPacket = Config.callsign;
+        beaconPacket += ">APLRG1";
+        if (Config.beacon.path.indexOf("WIDE") == 0) {
+            beaconPacket += ",";
+            beaconPacket += Config.beacon.path;
         }
-        return beaconPacket;
+        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);
+            Config.loramodule.txActive  = false;
+            Config.aprs_is.messagesToRF = false;
+            Config.aprs_is.objectsToRF  = false;
+            Config.beacon.sendViaRF     = false;
+            Config.digi.mode            = 0;
+            Config.backupDigiMode       = false;
+        }
+        generateBeaconFirstPart();
+        String encodedGPS       = encodeGPS(Config.beacon.latitude, Config.beacon.longitude, Config.beacon.overlay, Config.beacon.symbol);
+        iGateBeaconPacket       += encodedGPS;        
+        iGateLoRaBeaconPacket   += encodedGPS;
     }
 
     double calculateDistanceTo(double latitude, double longitude) {
-        return TinyGPSPlus::distanceBetween(currentWiFi->latitude,currentWiFi->longitude, latitude, longitude) / 1000.0;
+        return TinyGPSPlus::distanceBetween(Config.beacon.latitude,Config.beacon.longitude, latitude, longitude) / 1000.0;
     }
 
-    String decodeEncodedGPS(String packet) {
-        String GPSPacket = packet.substring(packet.indexOf(":!")+3);
-        String encodedLatitude    = GPSPacket.substring(0,4);
-        String encodedLongtitude  = GPSPacket.substring(4,8);
+    String decodeEncodedGPS(const String& packet) {
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+
+        const uint8_t OFFSET = 3;     // Offset for encoded data in the packet
+        String GPSPacket;
+        if (indexOfExclamation > 10) {
+            GPSPacket = packet.substring(indexOfExclamation + OFFSET);
+        } else if (indexOfEqual > 10) {
+            GPSPacket = packet.substring(indexOfEqual + OFFSET);
+        }
+
+        String encodedLatitude = GPSPacket.substring(0,4);
+        int Y1 = encodedLatitude[0] - 33;
+        int Y2 = encodedLatitude[1] - 33;
+        int Y3 = encodedLatitude[2] - 33;
+        int Y4 = encodedLatitude[3] - 33;
+        float decodedLatitude = 90.0 - (((Y1 * pow(91,3)) + (Y2 * pow(91,2)) + (Y3 * 91) + Y4) / 380926.0);
+
+        String encodedLongitude = GPSPacket.substring(4,8);
+        int X1 = encodedLongitude[0] - 33;
+        int X2 = encodedLongitude[1] - 33;
+        int X3 = encodedLongitude[2] - 33;
+        int X4 = encodedLongitude[3] - 33;
+        float decodedLongitude = -180.0 + (((X1 * pow(91,3)) + (X2 * pow(91,2)) + (X3 * 91) + X4) / 190463.0);
 
-        int Y1 = int(encodedLatitude[0]);
-        int Y2 = int(encodedLatitude[1]);
-        int Y3 = int(encodedLatitude[2]);
-        int Y4 = int(encodedLatitude[3]);
-        float decodedLatitude = 90.0 - ((((Y1-33) * pow(91,3)) + ((Y2-33) * pow(91,2)) + ((Y3-33) * 91) + Y4-33) / 380926.0);
-        
-        int X1 = int(encodedLongtitude[0]);
-        int X2 = int(encodedLongtitude[1]);
-        int X3 = int(encodedLongtitude[2]);
-        int X4 = int(encodedLongtitude[3]);
-        float decodedLongitude = -180.0 + ((((X1-33) * pow(91,3)) + ((X2-33) * pow(91,2)) + ((X3-33) * 91) + X4-33) / 190463.0);
         distance = String(calculateDistanceTo(decodedLatitude, decodedLongitude),1);
-        return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km";
+
+        String decodedGPS = String(decodedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(decodedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
+        String comment = GPSPacket.substring(12);
+        if (comment != "") {
+            decodedGPS += " / ";
+            decodedGPS += comment;
+        }
+        return decodedGPS;
     }
 
-    String getReceivedGPS(String packet) {
+    String getReceivedGPS(const String& packet) {
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+        int indexOfAt           = packet.indexOf(":@");
+
         String infoGPS;
-        if (packet.indexOf(":!") > 10) {
-            infoGPS = packet.substring(packet.indexOf(":!")+2);
-        } else if (packet.indexOf(":=") > 10) {
-            infoGPS = packet.substring(packet.indexOf(":=")+2);
+        if (indexOfExclamation > 10) {
+            infoGPS = packet.substring(indexOfExclamation + 2);
+        } else if (indexOfEqual > 10) {
+            infoGPS = packet.substring(indexOfEqual + 2);
+        } else if (indexOfAt > 10) {
+            infoGPS = packet.substring(indexOfAt + 9);  // 9 = 2+7 (when 7 is timestamp characters)
         }
-        String Latitude       = infoGPS.substring(0,8);
-        String Longitude      = infoGPS.substring(9,18);
 
-        float convertedLatitude, convertedLongitude;
-        String firstLatPart   = Latitude.substring(0,2);
-        String secondLatPart  = Latitude.substring(2,4);
-        String thirdLatPart   = Latitude.substring(Latitude.indexOf(".")+1,Latitude.indexOf(".")+3);
-        String firstLngPart   = Longitude.substring(0,3);
-        String secondLngPart  = Longitude.substring(3,5);
-        String thirdLngPart   = Longitude.substring(Longitude.indexOf(".")+1,Longitude.indexOf(".")+3);
-        convertedLatitude     = firstLatPart.toFloat() + (secondLatPart.toFloat()/60) + (thirdLatPart.toFloat()/(60*100));
-        convertedLongitude    = firstLngPart.toFloat() + (secondLngPart.toFloat()/60) + (thirdLngPart.toFloat()/(60*100));
+        String Latitude             = infoGPS.substring(0,8);                   // First 8 characters are Latitude
+        float convertedLatitude     = Latitude.substring(0,2).toFloat();        // First 2 digits (Degrees)
+        convertedLatitude += Latitude.substring(2,4).toFloat() / 60;            // Next 2 digits (Minutes)
+        convertedLatitude += Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3).toFloat() / (60*100);
+        if (Latitude.endsWith("S")) convertedLatitude = -convertedLatitude;     // Handle Southern Hemisphere
+
+        String Longitude            = infoGPS.substring(9,18);                  // Next 9 characters are Longitude
+        float convertedLongitude    = Longitude.substring(0,3).toFloat();       // First 3 digits (Degrees)
+        convertedLongitude += Longitude.substring(3,5).toFloat() / 60;          // Next 2 digits (Minutes)
+        convertedLongitude += Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3).toFloat() / (60*100);
+        if (Longitude.endsWith("W")) convertedLongitude = -convertedLongitude;  // Handle Western Hemisphere
         
-        String LatSign = String(Latitude[7]);
-        String LngSign = String(Longitude[8]);
-        if (LatSign == "S") {
-            convertedLatitude = -convertedLatitude;
-        } 
-        if (LngSign == "W") {
-            convertedLongitude = -convertedLongitude;
-        }
         distance = String(calculateDistanceTo(convertedLatitude, convertedLongitude),1);
-        return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km";
+
+        String decodedGPS = String(convertedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(convertedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
+        String comment = infoGPS.substring(19);  
+        if (comment != "") {
+            decodedGPS += " / ";
+            decodedGPS += comment;
+        }
+        return decodedGPS;
     }
 
-    String getDistance(String packet) {
-        int encodedBytePosition = 0;
-        if (packet.indexOf(":!") > 10) {
-            encodedBytePosition = packet.indexOf(":!") + 14;
-        }
-        if (packet.indexOf(":=") > 10) {
-            encodedBytePosition = packet.indexOf(":=") + 14;
-        }
-        if (encodedBytePosition != 0) {
-            if (String(packet[encodedBytePosition]) == "G" || String(packet[encodedBytePosition]) == "Q" || String(packet[encodedBytePosition]) == "[" || String(packet[encodedBytePosition]) == "H") {
-                return decodeEncodedGPS(packet);
-            } else {
-                return getReceivedGPS(packet);
-            }
+    String getDistanceAndComment(const String& packet) {
+        int indexOfAt = packet.indexOf(":@");
+        if (indexOfAt > 10) {
+            return getReceivedGPS(packet);
         } else {
-            return " _ / _ / _ ";
+            const uint8_t ENCODED_BYTE_OFFSET = 14;     // Offset for encoded data in the packet
+            int indexOfExclamation  = packet.indexOf(":!");
+            int indexOfEqual        = packet.indexOf(":=");
+            uint8_t encodedBytePosition = 0;
+            if (indexOfExclamation > 10) {              // Determine the position where encoded data starts
+                encodedBytePosition = indexOfExclamation + ENCODED_BYTE_OFFSET;
+            } else if (indexOfEqual > 10) {
+                encodedBytePosition = indexOfEqual + ENCODED_BYTE_OFFSET;
+            }
+
+            if (encodedBytePosition != 0) {
+                char currentChar = packet[encodedBytePosition];
+                if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') {
+                    return decodeEncodedGPS(packet);    // If valid encoded data position is found, decode it
+                } else {
+                    return getReceivedGPS(packet);
+                }
+            } else {
+                return " _ / _ / _ ";
+            }
+        }
+    }
+
+    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

@@ -1,21 +0,0 @@
-#ifndef GPS_UTILS_H_
-#define GPS_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace GPS_Utils {
-
-    String double2string(double n, int ndec);
-    String processLatitudeAPRS();
-    String processLongitudeAPRS();
-    String generateBeacon();
-    String generateiGateLoRaBeacon();
-    double calculateDistanceCourse(double latitude, double longitude);
-    String decodeEncodedGPS(String packet);
-    String getReceivedGPS(String packet);
-    String getDistance(String packet);
-
-}
-
-#endif

src/kiss_utils.cpp

@@ -0,0 +1,171 @@
+#include <Arduino.h>
+#include "kiss_protocol.h"
+
+
+bool validateTNC2Frame(const String& tnc2FormattedFrame) {
+    return (tnc2FormattedFrame.indexOf(':') != -1) && (tnc2FormattedFrame.indexOf('>') != -1);
+}
+
+bool validateKISSFrame(const String& kissFormattedFrame) {
+    return kissFormattedFrame.charAt(0) == (char)FEND && kissFormattedFrame.charAt(kissFormattedFrame.length() - 1) == (char)FEND;
+}
+
+String encodeAddressAX25(String tnc2Address) {
+    bool hasBeenDigipited = tnc2Address.indexOf('*') != -1;
+
+    if (tnc2Address.indexOf('-') == -1) {
+        if (hasBeenDigipited) {
+            tnc2Address = tnc2Address.substring(0, tnc2Address.length() - 1);
+        }
+
+        tnc2Address += "-0";
+    }
+
+    int separatorIndex = tnc2Address.indexOf('-');
+    int ssid = tnc2Address.substring(separatorIndex + 1).toInt();
+
+    String kissAddress = "";
+    for (int i = 0; i < 6; ++i) {
+        char addressChar;
+        if (tnc2Address.length() > i && i < separatorIndex) {
+            addressChar = tnc2Address.charAt(i);
+        } else {
+            addressChar = ' ';
+        }
+        kissAddress += (char)(addressChar << 1);
+    }
+
+    kissAddress += (char)((ssid << 1) | 0b01100000 | (hasBeenDigipited ? HAS_BEEN_DIGIPITED_MASK : 0));
+    return kissAddress;
+}
+
+String decodeAddressAX25(const String& ax25Address, bool& isLast, bool isRelay) {
+    String address = "";
+    for (int i = 0; i < 6; ++i) {
+        uint8_t currentCharacter = ax25Address.charAt(i);
+        currentCharacter >>= 1;
+        if (currentCharacter != ' ') {
+            address += (char)currentCharacter;
+        }
+    }
+    auto ssidChar = (uint8_t)ax25Address.charAt(6);
+    bool hasBeenDigipited = ssidChar & HAS_BEEN_DIGIPITED_MASK;
+    isLast = ssidChar & IS_LAST_ADDRESS_POSITION_MASK;
+    ssidChar >>= 1;
+
+    int ssid = 0b1111 & ssidChar;
+
+    if (ssid) {
+        address += '-';
+        address += ssid;
+    }
+    if (isRelay && hasBeenDigipited) {
+        address += '*';
+    }
+
+    return address;
+}
+
+String encapsulateKISS(const String& ax25Frame, uint8_t cmd) {
+    String kissFrame = "";
+    kissFrame += (char)FEND;
+    kissFrame += (char)(0x0f & cmd);
+
+    for (int i = 0; i < ax25Frame.length(); ++i) {
+        char currentChar = ax25Frame.charAt(i);
+        if (currentChar == (char)FEND) {
+            kissFrame += (char)FESC;
+            kissFrame += (char)TFEND;
+        } else if (currentChar == (char)FESC) {
+            kissFrame += (char)FESC;
+            kissFrame += (char)TFESC;
+        } else {
+            kissFrame += currentChar;
+        }
+    }
+    kissFrame += (char)FEND; // end of frame
+    return kissFrame;
+}
+
+
+String decapsulateKISS(const String& frame) {
+    String ax25Frame = "";
+    for (int i = 2; i < frame.length() - 1; ++i) {
+        char currentChar = frame.charAt(i);
+        if (currentChar == (char)FESC) {
+            char nextChar = frame.charAt(i + 1);
+            if (nextChar == (char)TFEND) {
+                ax25Frame += (char)FEND;
+            } else if (nextChar == (char)TFESC) {
+                ax25Frame += (char)FESC;
+            }
+            i++;
+        } else {
+            ax25Frame += currentChar;
+        }
+    }
+
+    return ax25Frame;
+}
+
+String encodeKISS(const String& frame) {
+    String ax25Frame = "";
+
+    if (validateTNC2Frame(frame)) {
+        String address = "";
+        bool dstAddresWritten = false;
+        for (int p = 0; p <= frame.indexOf(':'); p++) {
+            char currentChar = frame.charAt(p);
+            if (currentChar == ':' || currentChar == '>' || currentChar == ',') {
+                if (!dstAddresWritten && (currentChar == ',' || currentChar == ':')) {
+                    ax25Frame = encodeAddressAX25(address) + ax25Frame;
+                    dstAddresWritten = true;
+                } else {
+                    ax25Frame += encodeAddressAX25(address);
+                }
+                address = "";
+            } else {
+                address += currentChar;
+            }
+        }
+
+        auto lastAddressChar = (uint8_t)ax25Frame.charAt(ax25Frame.length() - 1);
+        ax25Frame.setCharAt(ax25Frame.length() - 1, (char)(lastAddressChar | IS_LAST_ADDRESS_POSITION_MASK));
+        ax25Frame += (char)APRS_CONTROL_FIELD;
+        ax25Frame += (char)APRS_INFORMATION_FIELD;
+        ax25Frame += frame.substring(frame.indexOf(':') + 1);
+    }
+
+    String kissFrame = encapsulateKISS(ax25Frame, CMD_DATA);
+    return kissFrame;
+}
+
+String decodeKISS(const String& inputFrame, bool& dataFrame) {
+    String frame = "";
+
+    if (validateKISSFrame(inputFrame)) {
+        dataFrame = inputFrame.charAt(1) == CMD_DATA;
+        if (dataFrame) {
+            String ax25Frame = decapsulateKISS(inputFrame);
+            bool isLast = false;
+            String dstAddr = decodeAddressAX25(ax25Frame.substring(0, 7), isLast, false);
+            String srcAddr = decodeAddressAX25(ax25Frame.substring(7, 14), isLast, false);
+
+            frame = srcAddr + ">" + dstAddr;
+
+            int digiInfoIndex = 14;
+            while (!isLast && digiInfoIndex + 7 < ax25Frame.length()) {
+                String digiAddr = decodeAddressAX25(ax25Frame.substring(digiInfoIndex, digiInfoIndex + 7), isLast, true);
+                frame += ',' + digiAddr;
+                digiInfoIndex += 7;
+            }
+
+            frame += ':';
+            frame += ax25Frame.substring(digiInfoIndex + 2);
+        } else {
+            frame += inputFrame;
+        }
+    }
+
+    return frame;
+}

src/lora_utils.cpp

@@ -1,24 +1,42 @@
 #include <RadioLib.h>
-#include <LoRa.h>
 #include <WiFi.h>
 #include "configuration.h"
 #include "aprs_is_utils.h"
+#include "station_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
-#include "pins_config.h"
+#include "ntp_utils.h"
 #include "display.h"
+#include "utils.h"
 
-extern Configuration  Config;
-extern int            stationMode;
 
-#if defined(HELTEC_V3) || defined(TTGO_T_Beam_V1_2_SX1262)
-SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
-bool transmissionFlag = true;
-bool enableInterrupt = true;
+extern Configuration    Config;
+extern uint32_t         lastRxTime;
+
+extern std::vector<ReceivedPacket> receivedPackets;
+
+bool operationDone   = true;
+bool transmitFlag    = true;
+
+#ifdef HAS_SX1262
+    SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
 #endif
-#if defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0_SX1268)
-SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
-bool transmissionFlag = true;
-bool enableInterrupt = true;
+#ifdef HAS_SX1268
+    #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);
+#endif
+#ifdef HAS_SX1276
+    SX1276 radio = new Module(RADIO_CS_PIN, RADIO_BUSY_PIN, RADIO_RST_PIN);
+#endif
+#if defined(HAS_LLCC68)         //LLCC68 supports spreading factor only in range of 5-11!
+    LLCC68 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
 #endif
 
 int rssi, freqError;
@@ -28,198 +46,195 @@ float snr;
 namespace LoRa_Utils {
 
     void setFlag(void) {
-        #ifdef HAS_SX126X
-        transmissionFlag = true;
-        #endif
+        operationDone = true;
     }
 
     void setup() {
-        #ifdef HAS_SX127X
-        SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
-        LoRa.setPins(LORA_CS, LORA_RST, LORA_IRQ);
-        long freq;
-        if (stationMode==1 || stationMode==2) {
-            freq = Config.loramodule.iGateFreq;
-        } else {
-            freq = Config.loramodule.digirepeaterTxFreq;
-        }
-        if (!LoRa.begin(freq)) {
-            Serial.println("Starting LoRa failed!");
-            show_display("ERROR", "Starting LoRa failed!");
-            while (true) {
-                delay(1000);
-            }
-        }
-        LoRa.setSpreadingFactor(Config.loramodule.spreadingFactor);
-        LoRa.setSignalBandwidth(Config.loramodule.signalBandwidth);
-        LoRa.setCodingRate4(Config.loramodule.codingRate4);
-        LoRa.enableCrc();
-        LoRa.setTxPower(Config.loramodule.power);
-        Serial.print("init : LoRa Module    ...     done!");
+        #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;
         #endif
-        #ifdef HAS_SX126X
-        SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
-        float freq = (float)Config.loramodule.iGateFreq/1000000;
         int state = radio.begin(freq);
         if (state == RADIOLIB_ERR_NONE) {
-            Serial.print("Initializing SX126X LoRa Module");
+            Utils::println("Initializing LoRa Module");
         } else {
-            Serial.println("Starting LoRa failed!");
-        while (true);
-        }
-        radio.setDio1Action(setFlag);
-        radio.setSpreadingFactor(Config.loramodule.spreadingFactor);
-        radio.setBandwidth(Config.loramodule.signalBandwidth);
-        radio.setCodingRate(Config.loramodule.codingRate4);
-        radio.setCRC(true);
-        #if defined(ESP32_DIY_1W_LoRa)
-        radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
-        #endif
-        #if defined(HELTEC_V3)  || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
-        state = radio.setOutputPower(Config.loramodule.power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
-        #endif
-        #ifdef ESP32_DIY_1W_LoRa_GPS
-        state = radio.setOutputPower(Config.loramodule.power); // max value 20 (when 20dB in setup 30dB in output as 400M30S has Low Noise Amp) 
-        #endif
-        if (state == RADIOLIB_ERR_NONE) {
-            Serial.println("init : LoRa Module    ...     done!");
-        } else {
-            Serial.println("Starting LoRa failed!");
+            Utils::println("Starting LoRa failed! State: " + String(state));
             while (true);
         }
-        #endif
-    }
-
-    void sendNewPacket(const String &typeOfMessage, const String &newPacket) {
-        #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-        digitalWrite(internalLedPin,HIGH);
-        #endif
-        #ifdef HAS_SX127X
-        LoRa.beginPacket();
-        LoRa.write('<');
-        if (typeOfMessage == "APRS")  {
-            LoRa.write(0xFF);
-        } else if (typeOfMessage == "LoRa") {
-            LoRa.write(0xF8);
-        }
-        LoRa.write(0x01);
-        LoRa.write((const uint8_t *)newPacket.c_str(), newPacket.length());
-        LoRa.endPacket();
-        #endif
-        #ifdef HAS_SX126X
-        int state = radio.transmit("\x3c\xff\x01" + newPacket);
-        if (state == RADIOLIB_ERR_NONE) {
-            //Serial.println(F("success!"));
-        } else if (state == RADIOLIB_ERR_PACKET_TOO_LONG) {
-            Serial.println(F("too long!"));
-        } else if (state == RADIOLIB_ERR_TX_TIMEOUT) {
-            Serial.println(F("timeout!"));
-        } else {
-            Serial.print(F("failed, code "));
-            Serial.println(state);
-        }
-        #endif
-        #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-        digitalWrite(internalLedPin,LOW);
-        #endif
-        SYSLOG_Utils::log("Tx", newPacket,0,0,0);
-        Serial.print("---> LoRa Packet Tx    : ");
-        Serial.println(newPacket);
-    }
-
-    String generatePacket(String aprsisPacket) {
-        String firstPart, messagePart;
-        aprsisPacket.trim();
-        firstPart = aprsisPacket.substring(0, aprsisPacket.indexOf(","));
-        messagePart = aprsisPacket.substring(aprsisPacket.indexOf("::")+2);
-        return firstPart + ",TCPIP,WIDE1-1," + Config.callsign + "::" + messagePart;
-    }
-
-    String packetSanitization(String packet) {
-        Serial.println(packet);
-        if (packet.indexOf("\0")>0) {
-            packet.replace("\0","");
-        }
-        if (packet.indexOf("\r")>0) {
-            packet.replace("\r","");
-        }
-        if (packet.indexOf("\n")>0) {
-            packet.replace("\n","");
-        }
-        return packet;
-    }
-
-    String receivePacket() {
-        String loraPacket = "";
-        #ifdef HAS_SX127X
-        int packetSize = LoRa.parsePacket();
-        if (packetSize) {
-            while (LoRa.available()) {
-                int inChar = LoRa.read();
-                loraPacket += (char)inChar;
-            }
-            rssi      = LoRa.packetRssi();
-            snr       = LoRa.packetSnr();
-            freqError = LoRa.packetFrequencyError();
-        }
-        #endif
-        #ifdef HAS_SX126X
-        if (transmissionFlag) {
-            transmissionFlag = false;
-            radio.startReceive();
-            int state = radio.readData(loraPacket);
-            if (state == RADIOLIB_ERR_NONE) {
-                Serial.println("LoRa Rx ---> " + loraPacket);
-                rssi      = radio.getRSSI();
-                snr       = radio.getSNR();
-                freqError = radio.getFrequencyError();
-            } else if (state == RADIOLIB_ERR_RX_TIMEOUT) {
-                // timeout occurred while waiting for a packet
-            } else if (state == RADIOLIB_ERR_CRC_MISMATCH) {
-                Serial.println(F("CRC error!"));
+        #if defined(HAS_SX1262) || defined(HAS_SX1268) || defined(HAS_LLCC68)
+            if (!Config.lowPowerMode) {
+                radio.setDio1Action(setFlag);
             } else {
-                Serial.print(F("failed, code "));
-                Serial.println(state);
+                radio.setDIOMapping(1, RADIOLIB_SX126X_IRQ_RX_DONE);
             }
-        }
+        #endif
+        #if defined(HAS_SX1278) || defined(HAS_SX1276)
+            radio.setDio0Action(setFlag, RISING);
+        #endif
+        radio.setSpreadingFactor(Config.loramodule.spreadingFactor);
+        float signalBandwidth = Config.loramodule.signalBandwidth/1000;
+        radio.setBandwidth(signalBandwidth);
+        radio.setCodingRate(Config.loramodule.codingRate4);
+        radio.setCRC(true);
+
+        #if (defined(RADIO_RXEN) && defined(RADIO_TXEN)) || defined(LIGHTGATEWAY_1_0)   // QRP Labs LightGateway has 400M22S (SX1268)
+            radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
         #endif
 
-        if ((loraPacket.indexOf("\0")!=-1) || (loraPacket.indexOf("\r")!=-1) || (loraPacket.indexOf("\n")!=-1)) {
-            loraPacket = packetSanitization(loraPacket);
-        }
-
-        #ifndef TextSerialOutputForApp
-        if (loraPacket!="") {
-            Serial.println("(RSSI:" +String(rssi) + " / SNR:" + String(snr) +  " / FreqErr:" + String(freqError) + ")");
-        }
+        #ifdef HAS_1W_LORA  // Ebyte E22 400M30S (SX1268) / 900M30S (SX1262) / Ebyte E220 400M30S (LLCC68)
+            state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 1W modules as they have Low Noise Amp
+            radio.setCurrentLimit(140); // to be validated (100 , 120, 140)?
         #endif
-        
-        if (Config.syslog.active && (stationMode==1 || stationMode==2 || (stationMode==5 && WiFi.status()==WL_CONNECTED)) && loraPacket!="") {
-            SYSLOG_Utils::log("Rx", loraPacket, rssi, snr, freqError);
+        #if defined(HAS_SX1278) || defined(HAS_SX1276)
+            state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp
+            radio.setCurrentLimit(100); // to be validated (80 , 100)?
+        #endif
+        #if (defined(HAS_SX1268) || defined(HAS_SX1262)) && !defined(HAS_1W_LORA)
+            state = radio.setOutputPower(Config.loramodule.power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
+            radio.setCurrentLimit(140);
+        #endif
+
+        #if defined(HAS_SX1262) || defined(HAS_SX1268) || defined(HAS_LLCC68)
+            radio.setRxBoostedGainMode(true);
+        #endif
+
+        if (state == RADIOLIB_ERR_NONE) {
+            Utils::println("init : LoRa Module    ...     done!");
+        } else {
+            Utils::println("Starting LoRa failed! State: " + String(state));
+            while (true);
         }
-        return loraPacket;
     }
 
     void changeFreqTx() {
         delay(500);
-        #ifdef HAS_SX127X
-        LoRa.setFrequency(Config.loramodule.digirepeaterTxFreq);
-        #endif
-        #ifdef HAS_SX126X
-        float freq = (float)Config.loramodule.digirepeaterTxFreq/1000000;
+        float freq = (float)Config.loramodule.txFreq / 1000000;
         radio.setFrequency(freq);
-        #endif
     }
 
     void changeFreqRx() {
         delay(500);
-        #ifdef HAS_SX127X
-        LoRa.setFrequency(Config.loramodule.digirepeaterRxFreq);
-        #endif
-        #ifdef HAS_SX126X
-        float freq = (float)Config.loramodule.digirepeaterRxFreq/1000000;
+        float freq = (float)Config.loramodule.rxFreq / 1000000;
         radio.setFrequency(freq);
+    }
+
+    void sendNewPacket(const String& newPacket) {
+        if (!Config.loramodule.txActive) return;
+
+        if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
+            changeFreqTx();
+        }
+        
+        #ifdef INTERNAL_LED_PIN
+            if (!Config.digi.ecoMode) digitalWrite(INTERNAL_LED_PIN, HIGH);
         #endif
+        int state = radio.transmit("\x3c\xff\x01" + newPacket);
+        transmitFlag = true;
+        if (state == RADIOLIB_ERR_NONE) {
+            if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+                SYSLOG_Utils::log(3, newPacket, 0, 0.0, 0);    // TX
+            }
+            Utils::print("---> LoRa Packet Tx : ");
+            Utils::println(newPacket);
+        } else {
+            Utils::print(F("failed, code "));
+            Utils::println(String(state));
+        }
+        #ifdef INTERNAL_LED_PIN
+            if (!Config.digi.ecoMode) digitalWrite(INTERNAL_LED_PIN, LOW);
+        #endif
+        if (Config.loramodule.txFreq != Config.loramodule.rxFreq) {
+            changeFreqRx();
+        }
+    }
+
+    /*String packetSanitization(const String& packet) {
+        String sanitizedPacket = packet;
+        if (packet.indexOf("\0") > 0) {
+            sanitizedPacket.replace("\0", "");
+        }
+        if (packet.indexOf("\r") > 0) {
+            sanitizedPacket.replace("\r", "");
+        }
+        if (packet.indexOf("\n") > 0) {
+            sanitizedPacket.replace("\n", "");
+        }
+        return sanitizedPacket;
+    }*/
+
+    void startReceive() {
+        radio.startReceive();
+    }
+
+    String receivePacket() {
+        String packet = "";
+        if (operationDone || Config.lowPowerMode) {
+            operationDone = false;
+            if (transmitFlag && !Config.lowPowerMode) {
+                radio.startReceive();
+                transmitFlag = false;
+            } else {
+                int state = radio.readData(packet);
+                if (state == RADIOLIB_ERR_NONE) {
+                    if (packet != "") {
+
+                        String sender   = packet.substring(3, packet.indexOf(">"));
+                        if (packet.substring(0,3) == "\x3c\xff\x01" && !STATION_Utils::isBlacklisted(sender)){   // avoid processing BlackListed stations
+                            rssi        = radio.getRSSI();
+                            snr         = radio.getSNR();
+                            freqError   = radio.getFrequencyError();
+                            Utils::println("<--- LoRa Packet Rx : " + packet.substring(3));
+                            Utils::println("(RSSI:" + String(rssi) + " / SNR:" + String(snr) + " / FreqErr:" + String(freqError) + ")");
+
+                            if (!Config.lowPowerMode && !Config.digi.ecoMode) {
+                                if (receivedPackets.size() >= 10) {
+                                    receivedPackets.erase(receivedPackets.begin());
+                                }
+                                ReceivedPacket receivedPacket;
+                                receivedPacket.rxTime   = NTP_Utils::getFormatedTime();
+                                receivedPacket.packet   = packet.substring(3);
+                                receivedPacket.RSSI     = rssi;
+                                receivedPacket.SNR      = snr;
+                                receivedPackets.push_back(receivedPacket);
+                            }
+
+                            if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+                                SYSLOG_Utils::log(1, packet, rssi, snr, freqError); // RX
+                            }
+                        } else {
+                            packet = "";
+                        }                        
+                        lastRxTime = millis();
+                        return packet;
+                    }
+                } else if (state == RADIOLIB_ERR_CRC_MISMATCH) {
+                    rssi        = radio.getRSSI();
+                    snr         = radio.getSNR();
+                    freqError   = radio.getFrequencyError();
+                    Utils::println(F("CRC error!"));
+                    if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+                        SYSLOG_Utils::log(0, packet, rssi, snr, freqError); // CRC
+                    }
+                    packet = "";
+                } else {
+                    Utils::print(F("failed, code "));
+                    Utils::println(String(state));
+                    packet = "";
+                }
+            }
+        }
+        return packet;
+    }
+
+    void sleepRadio() {
+        radio.sleep();
     }
 
 }

src/lora_utils.h

@@ -1,19 +0,0 @@
-#ifndef LORA_UTILS_H_
-#define LORA_UTILS_H_
-
-#include <Arduino.h>
-
-
-namespace LoRa_Utils {
-
-    void setup();
-    void sendNewPacket(const String &typeOfMessage, const String &newPacket);
-    String generatePacket(String aprsisPacket);
-    String packetSanitization(String packet);
-    String receivePacket();
-    void changeFreqTx();
-    void changeFreqRx();
-
-}
-
-#endif

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/ota_utils.cpp

@@ -5,8 +5,10 @@
 #include "ota_utils.h"
 #include "display.h"
 
+
 extern Configuration        Config;
 extern uint32_t             lastScreenOn;
+extern bool                 isUpdatingOTA;
 
 unsigned long ota_progress_millis = 0;
 
@@ -28,31 +30,33 @@ namespace OTA_Utils {
 
     void onOTAStart() {
         Serial.println("OTA update started!");
-        display_toggle(true);
+        displayToggle(true);
         lastScreenOn = millis();
-        show_display("", "", "", " OTA update started!", "", "", "", 1000);
+        displayShow("", "", "", " OTA update started!", "", "", "", 1000);
+        isUpdatingOTA = true;
     }
 
     void onOTAProgress(size_t current, size_t final) {
         if (millis() - ota_progress_millis > 1000) {
-            display_toggle(true);
+            displayToggle(true);
             lastScreenOn = millis();
             ota_progress_millis = millis();
             Serial.printf("OTA Progress Current: %u bytes, Final: %u bytes\n", current, final);
-            show_display("", "", "  OTA Progress : " + String((current*100)/final) + "%", "", "", "", "", 100);
+            displayShow("", "", "  OTA Progress : " + String((current*100)/final) + "%", "", "", "", "", 100);
         }
     }
 
     void onOTAEnd(bool success) {
-        display_toggle(true);
+        displayToggle(true);
         lastScreenOn = millis();
-        if (success) {
-            Serial.println("OTA update finished successfully!");
-            show_display("", "", " OTA update success!", "", "    Rebooting ...", "", "", 4000);
-        } else {
-            Serial.println("There was an error during OTA update!");
-            show_display("", "", " OTA update fail!", "", "", "", "", 4000);
-        }
+
+        String statusMessage = success ? "OTA update success!" : "OTA update fail!";
+        String rebootMessage = success ? "Rebooting ..." : "";
+
+        Serial.println(success ? "OTA update finished successfully!" : "There was an error during OTA update!");
+        displayShow("", "", statusMessage, "", rebootMessage, "", "", 4000);
+        
+        isUpdatingOTA = false;
     }
     
 }

src/pins_config.h

@@ -1,118 +0,0 @@
-#ifndef PINS_CONFIG_H_
-#define PINS_CONFIG_H_
-
-#include <Arduino.h>
-
-#undef OLED_SDA
-#undef OLED_SCL
-#undef OLED_RST
-
-#if defined(HELTEC_V3) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
-#define HAS_SX126X
-#endif
-
-#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2)
-#define HAS_SX127X
-#endif
-
-#if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268)
-#define HAS_AXP192
-#endif
-
-#if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_SX1262)
-#define HAS_AXP2101
-#endif
-
-// LORA MODULES
-#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa)
-#undef LORA_RST
-#define LORA_SCK    5       // GPIO5    - SX1276 SCK
-#define LORA_MISO   19      // GPIO19   - SX1276 MISO
-#define LORA_MOSI   27      // GPIO27   - SX1276 MOSI
-#define LORA_CS     18      // GPIO18   - SX1276 CS ---> NSS
-#define LORA_RST    14      // GPIO14   - SX1276 RST
-#define LORA_IRQ    26      // GPIO26   - SX1276 IRQ ---->DIO0
-#endif
-
-#ifdef HELTEC_V3
-#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
-
-#ifdef ESP32_DIY_1W_LoRa    // Ebyte E22 400M30S / SX1268
-#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(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
-
-
-// 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)
-#define OLED_SDA    21
-#define OLED_SCL    22
-#define OLED_RESET  -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-#endif
-
-#ifdef HELTEC_V2
-#define OLED_SDA    4
-#define OLED_SCL    15
-#define OLED_RESET  16 
-#endif
-
-#ifdef HELTEC_V3
-#define OLED_SDA    17
-#define OLED_SCL    18
-#define OLED_RESET  21 
-#endif
-
-// Leds and other stuff
-#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2)
-#define internalLedPin  25      // Green Led
-#define batteryPin      35
-#endif
-#ifdef HELTEC_V3
-#define internalLedPin  35
-#endif
-#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
-#define internalLedPin  2
-#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/power_utils.cpp

@@ -1,18 +1,27 @@
 #include "configuration.h"
+#include "battery_utils.h"
+#include "board_pinout.h"
 #include "power_utils.h"
-#include "pins_config.h"
 
 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
-#define I2C_SDA 21
-#define I2C_SCL 22
-#define IRQ_PIN 35
+    #ifdef TTGO_T_Beam_S3_SUPREME_V3
+        #define I2C0_SDA 17
+        #define I2C0_SCL 18
+        #define I2C1_SDA 42
+        #define I2C1_SCL 41
+        #define IRQ_PIN  40
+    #else
+        #define I2C_SDA 21
+        #define I2C_SCL 22
+        #define IRQ_PIN 35
+    #endif
 #endif
 
 #ifdef HAS_AXP192
-XPowersAXP192 PMU;
+    XPowersAXP192 PMU;
 #endif
 #ifdef HAS_AXP2101
-XPowersAXP2101 PMU;
+    XPowersAXP2101 PMU;
 #endif
 
 extern Configuration    Config;
@@ -20,121 +29,248 @@ extern Configuration    Config;
 
 namespace POWER_Utils {
 
-    bool   BatteryIsConnected = false;
-    String batteryVoltage = "";
-    String batteryChargeDischargeCurrent = "";
+    double getBatteryVoltage() {
+        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
+            return (PMU.getBattVoltage() / 1000.0);
+        #else
+            return 0.0;
+        #endif
+    }
+
+    bool isBatteryConnected() {
+        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
+            return PMU.isBatteryConnect();
+        #else
+            return false;
+        #endif
+    }
 
     void activateMeasurement() {
         #if defined(HAS_AXP192) || defined(HAS_AXP2101)
-        PMU.disableTSPinMeasure();
-        PMU.enableBattDetection();
-        PMU.enableVbusVoltageMeasure();
-        PMU.enableBattVoltageMeasure();
-        PMU.enableSystemVoltageMeasure();
+            PMU.disableTSPinMeasure();
+            PMU.enableBattDetection();
+            PMU.enableVbusVoltageMeasure();
+            PMU.enableBattVoltageMeasure();
+            PMU.enableSystemVoltageMeasure();
         #endif
     }
 
+    void activateGPS() {
+        #ifdef HAS_AXP192
+            PMU.setLDO3Voltage(3300);
+            PMU.enableLDO3();
+        #endif
+
+        #ifdef HAS_AXP2101
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                PMU.setALDO4Voltage(3300);
+                PMU.enableALDO4();
+            #else
+                PMU.setALDO3Voltage(3300);
+                PMU.enableALDO3();
+            #endif
+        #endif
+        #ifdef HELTEC_WIRELESS_TRACKER
+            digitalWrite(VEXT_CTRL, HIGH);
+        #endif
+        //gpsIsActive = true;
+    }
+
+    void deactivateGPS() {
+        #ifdef HAS_AXP192
+            PMU.disableLDO3();
+        #endif
+
+        #ifdef HAS_AXP2101
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                PMU.disableALDO4();
+            #else
+                PMU.disableALDO3();
+            #endif
+        #endif
+        #ifdef HELTEC_WIRELESS_TRACKER
+            digitalWrite(VEXT_CTRL, LOW);
+        #endif
+        //gpsIsActive = false;
+    }
+
     void activateLoRa() {
         #ifdef HAS_AXP192
-        PMU.setLDO2Voltage(3300);
-        PMU.enableLDO2();
+            PMU.setLDO2Voltage(3300);
+            PMU.enableLDO2();
         #endif
         #ifdef HAS_AXP2101
-        PMU.setALDO2Voltage(3300);
-        PMU.enableALDO2();
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                PMU.setALDO3Voltage(3300);
+                PMU.enableALDO3();
+            #else
+                PMU.setALDO2Voltage(3300);
+                PMU.enableALDO2();
+            #endif
         #endif
     }
 
     void deactivateLoRa() {
         #ifdef HAS_AXP192
-        PMU.disableLDO2();
+            PMU.disableLDO2();
         #endif
         #ifdef HAS_AXP2101
-        PMU.disableALDO2();
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                PMU.disableALDO3();
+            #else
+                PMU.disableALDO2();
+            #endif
         #endif
     }
 
     bool begin(TwoWire &port) {
         #if defined(HAS_AXP192)
-        bool result = PMU.begin(Wire, AXP192_SLAVE_ADDRESS, I2C_SDA, I2C_SCL);
-        if (result) {
-            PMU.disableDC2();
-            PMU.disableLDO2();
-            PMU.disableLDO3();
-            PMU.setDC1Voltage(3300);
-            PMU.enableDC1();
-            PMU.setProtectedChannel(XPOWERS_DCDC3);
-            PMU.disableIRQ(XPOWERS_AXP192_ALL_IRQ);
-        }
-        return result;
+            bool result = PMU.begin(Wire, AXP192_SLAVE_ADDRESS, I2C_SDA, I2C_SCL);
+            if (result) {
+                PMU.disableDC2();
+                PMU.disableLDO2();
+                PMU.disableLDO3();
+                PMU.setDC1Voltage(3300);
+                PMU.enableDC1();
+                PMU.setProtectedChannel(XPOWERS_DCDC3);
+                PMU.disableIRQ(XPOWERS_AXP192_ALL_IRQ);
+            }
+            return result;
         #elif defined(HAS_AXP2101)
-        bool result = PMU.begin(Wire, AXP2101_SLAVE_ADDRESS, I2C_SDA, I2C_SCL);
-        if (result) {
-            PMU.disableDC2();
-            PMU.disableDC3();
-            PMU.disableDC4();
-            PMU.disableDC5();
-            PMU.disableALDO1();
-            PMU.disableALDO4();
-            PMU.disableBLDO1();
-            PMU.disableBLDO2();
-            PMU.disableDLDO1();
-            PMU.disableDLDO2();
-            PMU.setDC1Voltage(3300);
-            PMU.enableDC1();
-            PMU.setButtonBatteryChargeVoltage(3300);
-            PMU.enableButtonBatteryCharge();
-            PMU.disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
-        }
-        return result;
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                bool result = PMU.begin(Wire1, AXP2101_SLAVE_ADDRESS, I2C1_SDA, I2C1_SCL);
+            #else
+                bool result = PMU.begin(Wire, AXP2101_SLAVE_ADDRESS, I2C_SDA, I2C_SCL);
+            #endif
+            if (result) {
+                PMU.disableDC2();
+                PMU.disableDC3();
+                PMU.disableDC4();
+                PMU.disableDC5();
+                #ifndef TTGO_T_Beam_S3_SUPREME_V3
+                    PMU.disableALDO1();
+                    PMU.disableALDO4();
+                #endif
+                PMU.disableBLDO1();
+                PMU.disableBLDO2();
+                PMU.disableDLDO1();
+                PMU.disableDLDO2();
+                PMU.setDC1Voltage(3300);
+                PMU.enableDC1();
+                #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                    PMU.setALDO1Voltage(3300);
+                #endif
+                PMU.setButtonBatteryChargeVoltage(3300);
+                PMU.enableButtonBatteryCharge();
+                PMU.disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
+            }
+            return result;
         #else
-        return true;
+            return true;
         #endif
     }
 
-
     void setup() {
-        Wire.end();
         #ifdef HAS_AXP192
-        Wire.begin(SDA, SCL);
-        if (begin(Wire)) {
-            Serial.println("AXP192 init done!");
-        } else {
-            Serial.println("AXP192 init failed!");
-        }
-        activateLoRa();
-        activateMeasurement();
-        PMU.setChargerTerminationCurr(XPOWERS_AXP192_CHG_ITERM_LESS_10_PERCENT);
-        PMU.setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
-        PMU.setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_780MA);
-        PMU.setSysPowerDownVoltage(2600);
+            Wire.begin(SDA, SCL);
+            if (begin(Wire)) {
+                Serial.println("AXP192 init done!");
+            } else {
+                Serial.println("AXP192 init failed!");
+            }
+            activateLoRa();
+            activateMeasurement();
+            PMU.setChargerTerminationCurr(XPOWERS_AXP192_CHG_ITERM_LESS_10_PERCENT);
+            PMU.setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
+            PMU.setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_780MA);
+            PMU.setSysPowerDownVoltage(2600);
         #endif
 
         #ifdef HAS_AXP2101
-        Wire.begin(SDA, SCL);
-        if (begin(Wire)) {
-            Serial.println("AXP2101 init done!");
-        } else {
-            Serial.println("AXP2101 init failed!");
-        }
-        activateLoRa();
-        activateMeasurement();
-        PMU.setPrechargeCurr(XPOWERS_AXP2101_PRECHARGE_200MA);
-        PMU.setChargerTerminationCurr(XPOWERS_AXP2101_CHG_ITERM_25MA);
-        PMU.setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
-        PMU.setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_800MA);
-        PMU.setSysPowerDownVoltage(2600);
+            bool beginStatus = false;
+            #ifdef TTGO_T_Beam_S3_SUPREME_V3
+                Wire1.begin(I2C1_SDA, I2C1_SCL);
+                Wire.begin(I2C0_SDA, I2C0_SCL);
+                if (begin(Wire1)) beginStatus = true;
+            #else
+                Wire.begin(SDA, SCL);
+                if (begin(Wire)) beginStatus = true;
+            #endif
+            if (beginStatus) {
+                Serial.println("AXP2101 init done!");
+            } else {
+                Serial.println("AXP2101 init failed!");
+            }
+            activateLoRa();
+            activateMeasurement();
+            PMU.setPrechargeCurr(XPOWERS_AXP2101_PRECHARGE_200MA);
+            PMU.setChargerTerminationCurr(XPOWERS_AXP2101_CHG_ITERM_25MA);
+            PMU.setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
+            PMU.setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_800MA);
+            PMU.setSysPowerDownVoltage(2600);
         #endif
+
+        #ifdef BATTERY_PIN
+            pinMode(BATTERY_PIN, INPUT);
+        #endif
+
+        #ifdef INTERNAL_LED_PIN
+            pinMode(INTERNAL_LED_PIN, OUTPUT);
+        #endif
+
+        if (Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
+            pinMode(Config.battery.externalVoltagePin, INPUT);
+        }
+
+        #ifdef VEXT_CTRL
+            pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) 
+                digitalWrite(VEXT_CTRL, HIGH);
+            #endif
+            #if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2)
+                digitalWrite(VEXT_CTRL, LOW);
+            #endif
+        #endif
+        
+        #ifdef HAS_GPS
+            if (Config.beacon.gpsActive) activateGPS();
+        #endif
+
+        #ifdef ADC_CTRL
+            pinMode(ADC_CTRL, OUTPUT);
+        #endif
+
+        #if defined(HELTEC_WIRELESS_TRACKER)
+            Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #endif
+
+        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2)
+            Wire.begin(OLED_SDA, OLED_SCL);
+        #endif
+
+        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
+            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #endif      
+
+        #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
+            pinMode(BOARD_POWERON, OUTPUT);
+            digitalWrite(BOARD_POWERON, HIGH);
+
+            pinMode(BOARD_SDCARD_CS, OUTPUT);
+            pinMode(RADIO_CS_PIN, OUTPUT);
+            pinMode(TFT_CS, OUTPUT);
+
+            digitalWrite(BOARD_SDCARD_CS, HIGH);
+            digitalWrite(RADIO_CS_PIN, HIGH);
+            digitalWrite(TFT_CS, HIGH);
+
+            delay(500);
+            Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #endif  
+        
+        delay(1000);
+        BATTERY_Utils::setup();
+        BATTERY_Utils::startupBatteryHealth();
     }
 
-    /*void lowerCpuFrequency() {
-        #if defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2) || defined(ESP32_DIY_LoRa_GPS) || defined(TTGO_T_LORA32_V2_1_GPS) || defined(TTGO_T_LORA32_V2_1_TNC) || defined(ESP32_DIY_1W_LoRa_GPS) || defined(TTGO_T_Beam_V1_2_SX1262)
-        if (setCpuFrequencyMhz(80)) {
-            logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Main", "CPU frequency set to 80MHz");
-        } else {
-            logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, "Main", "CPU frequency unchanged");
-        }
-        #endif
-    }*/
-
 }

src/power_utils.h

@@ -1,19 +0,0 @@
-#ifndef POWER_UTILS_H_
-#define POWER_UTILS_H_
-
-#include <Arduino.h>
-#include "XPowersLib.h"
-
-
-namespace POWER_Utils {
-
-    void activateMeasurement();
-    void activateLoRa();
-    void deactivateLoRa();
-    bool begin(TwoWire &port);
-    void setup();
-    //void lowerCpuFrequency();
-
-}
-
-#endif