Merge pull request #412 from richonguzman/richonguzman-patch-18

Add 2 new target configurations for GPS variants

.github/workflows/build.yml

@@ -13,8 +13,12 @@ jobs:
                 target:
                     - name: ttgo-lora32-v21
                       chip: esp32
+                    - name: ttgo-lora32-v21_GPS
+                      chip: esp32
                     - name: ttgo-lora32-v21_915
                       chip: esp32
+                    - name: ttgo-lora32-v21_915_GPS
+                      chip: esp32                      
                     - name: ttgo_lora32_t3s3_v1_2
                       chip: esp32s3
                     - name: heltec-lora32-v2
@@ -55,6 +59,8 @@ jobs:
                       chip: esp32
                     - name: ttgo-t-beam-v1_SX1268
                       chip: esp32
+                    - name: ttgo-t-beam-v1_SX1262
+                      chip: esp32
                     - name: ttgo-t-beam-v1_2_SX1262
                       chip: esp32
                     - name: ttgo_t_deck_plus
@@ -113,7 +119,7 @@ jobs:
 
             - name: Build target
               run: |
-                  pio run -e ${{ matrix.target.name }} 
+                  pio run -e ${{ matrix.target.name }}
 
             - name: Build FS
               run: |
@@ -128,7 +134,7 @@ jobs:
                   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

README.md

@@ -51,6 +51,7 @@ ____________________________________________________
 <br />
 
 # Timeline (Versions):
+- 2026-03-25 More Boards, SDK update, OTA fix, GPS process update.
 - 2026-02-26 9M2IBR ESP32 1W (400M30S) + GPS board added.
 - 2026-02-25 Code Improvements: reduced String comparisons and improved logic for faster code execution.
 - 2026-02-15 Digipeater code/logic improved.

platformio.ini

@@ -20,13 +20,13 @@ platform = espressif32 @ 6.12.0
 board_build.partitions = min_spiffs.csv
 framework = arduino
 monitor_speed = 115200
-board_build.embed_files = 
+board_build.embed_files =
 	data_embed/index.html.gz
 	data_embed/style.css.gz
 	data_embed/script.js.gz
 	data_embed/bootstrap.css.gz
 	data_embed/bootstrap.js.gz
 	data_embed/favicon.png.gz
-extra_scripts = 
+extra_scripts =
 	pre:tools/compress.py
 debug_tool = esp-prog

src/LoRa_APRS_iGate.cpp

@@ -68,8 +68,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-03-11";
-String              versionNumber           = "3.2.107";
+String              versionDate             = "2026-03-25";
+String              versionNumber           = "3.2.3";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;

src/battery_utils.cpp

@@ -46,7 +46,7 @@ Adafruit_INA219     ina219;
 #ifdef HAS_ADC_CALIBRATION
     #include <esp_adc_cal.h>
 
-    #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915)
+    #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_GPS) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_V2_1_915_GPS)
         #define InternalBattery_ADC_Channel ADC1_CHANNEL_7  // t_lora32 pin35
         #define ExternalVoltage_ADC_Channel ADC1_CHANNEL_6  // t_lora32 pin34
     #endif

src/configuration.cpp

@@ -80,6 +80,9 @@ bool Configuration::writeFile() {
         data["beacon"]["statusPacket"]              = beacon.statusPacket;
 
         data["beacon"]["gpsActive"]                 = beacon.gpsActive;
+        #if !defined(HAS_GPS)
+            data["beacon"]["gpsActive"]             = false;
+        #endif
         data["beacon"]["ambiguityLevel"]            = beacon.ambiguityLevel;
 
         data["personalNote"]                        = personalNote;

src/utils.cpp

@@ -153,11 +153,18 @@ namespace Utils {
             beaconUpdate = true;
         }
 
+        bool configLocationIsValid = !(Config.beacon.latitude == 0.0 && Config.beacon.longitude == 0.0);
         #ifdef HAS_GPS
-            if (Config.beacon.gpsActive && gps.location.lat() == 0.0 && gps.location.lng() == 0.0 && Config.beacon.latitude == 0.0 && Config.beacon.longitude == 0.0) {
-                GPS_Utils::getData();
-                beaconUpdate = false;
+            if (Config.beacon.gpsActive) {      // GPS activated
+                if (!gps.location.isValid()) {
+                    GPS_Utils::getData();       // refresh GPS
+                    beaconUpdate = false;
+                }
+            } else {                            // GPS not active: use saved data in Config
+                if (!configLocationIsValid) beaconUpdate = false;
             }
+        #else                                   // No GPS available: use saved data in Config
+            if (!configLocationIsValid) beaconUpdate = false;
         #endif
 
         if (beaconUpdate) {

src/web_utils.cpp

@@ -98,7 +98,7 @@ namespace WEB_Utils {
     }
 
     void handleReceivedPackets(AsyncWebServerRequest *request) {
-        StaticJsonDocument<1536> data;
+        JsonDocument data;
 
         for (int i = 0; i < receivedPackets.size(); i++) {
             data[i]["rxTime"]   = receivedPackets[i].rxTime;

variants/ttgo-lora32-v21_915_GPS/board_pinout.h

@@ -0,0 +1,58 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ *
+ * This file is part of LoRa APRS iGate.
+ *
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1276
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_26
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_BAUDRATE            9600
+    #define GPS_RX                  12
+    #define GPS_TX                  34
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        25      // Green Led
+    #define BATTERY_PIN             35
+    #define HAS_ADC_CALIBRATION
+
+#endif

variants/ttgo-lora32-v21_915_GPS/platformio.ini

@@ -0,0 +1,11 @@
+[env:ttgo-lora32-v21_915_GPS]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX126X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D TTGO_LORA32_V2_1_915_GPS
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/ttgo-lora32-v21_GPS/board_pinout.h

@@ -0,0 +1,58 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ *
+ * This file is part of LoRa APRS iGate.
+ *
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_26
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_BAUDRATE            9600
+    #define GPS_RX                  12
+    #define GPS_TX                  34
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        25      // Green Led
+    #define BATTERY_PIN             35
+	#define HAS_ADC_CALIBRATION
+
+#endif

variants/ttgo-lora32-v21_GPS/platformio.ini

@@ -0,0 +1,11 @@
+[env:ttgo-lora32-v21_GPS]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX126X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D TTGO_LORA32_V2_1_GPS
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/ttgo-t-beam-v1_SX1262/board_pinout.h

@@ -0,0 +1,55 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ *
+ * This file is part of LoRa APRS iGate.
+ *
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define HAS_TCXO
+    #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
+    #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_33
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  Aditional Config
+    #define HAS_AXP192
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_RX                  12
+    #define GPS_TX                  34
+
+#endif

variants/ttgo-t-beam-v1_SX1262/platformio.ini

@@ -0,0 +1,12 @@
+[env:ttgo-t-beam-v1_SX1262]
+board = ttgo-t-beam
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX127X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D TTGO_T_BEAM_V1_0_SX1262
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
+	lewisxhe/XPowersLib @ 0.2.4