stationCallsignIsValid

include/utils.h

@@ -45,7 +45,7 @@ namespace Utils {
     void    checkRebootMode();
     void    checkRebootTime();
     void    checkSleepByLowBatteryVoltage(uint8_t mode);
-    bool    checkValidCallsign(const String& callsign);
+    bool    callsignIsValid(const String& callsign);
     void    startupDelay();
 
 }

src/LoRa_APRS_iGate.cpp

@@ -67,7 +67,7 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-01-21";
+String              versionDate             = "2026-02-16";
 String              versionNumber           = "3.2";
 Configuration       Config;
 WiFiClient          aprsIsClient;

src/aprs_is_utils.cpp

@@ -204,7 +204,7 @@ namespace APRS_IS_Utils {
                 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)) {
+                    if (Sender != Config.callsign && Utils::callsignIsValid(Sender)) {
                         STATION_Utils::updateLastHeard(Sender);
                         Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
                         const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);

src/digi_utils.cpp

@@ -99,8 +99,8 @@ namespace DIGI_Utils {
         } else {
             temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
         }
-        if (temp.indexOf(",") > 2) { // checks for path
+        if (temp.indexOf(",") > 2) { // checks for path in temp
-            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
+            const String& path = temp.substring(temp.indexOf(",") + 1); // extract path after tocall
             if (Config.digi.mode == 2 || backupDigiMode) {
                 if (path.indexOf("WIDE1-1") != - 1) {
                     return buildPacket(path, packet, thirdParty, false);
@@ -135,7 +135,8 @@ namespace DIGI_Utils {
     }
 
     void processLoRaPacket(const String& packet) {
-        if (packet.indexOf("NOGATE") == -1) {
+        if (packet.indexOf("NOGATE") >= 0) return;
+
         bool thirdPartyPacket = false;
         String temp, Sender;
         int firstColonIndex = packet.indexOf(":");
@@ -147,10 +148,10 @@ namespace DIGI_Utils {
             temp    = packet.substring(3);
             Sender  = packet.substring(3, packet.indexOf(">"));
         }
-            if (Sender != (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {    // Avoid listening to own packets
+
-                if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::checkValidCallsign(Sender)) {
+        if (Sender == (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) return;  // Avoid listening to self packets
-                    return;
+        if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::callsignIsValid(Sender)) return;  // No thirdParty + no tactical y no valid callsign
-                }
+
         if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
             STATION_Utils::updateLastHeard(Sender);
             Utils::typeOfPacket(temp, 2);    // Digi
@@ -172,8 +173,7 @@ namespace DIGI_Utils {
                 }
             }
         }
-            }
+        //}
-        }
     }
 
 }

src/gps_utils.cpp

@@ -34,7 +34,7 @@
 extern Configuration    Config;
 extern HardwareSerial   gpsSerial;
 extern TinyGPSPlus      gps;
-extern bool             callsignIsValid;
+extern bool             stationCallsignIsValid;
 String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
 
 
@@ -49,7 +49,7 @@ namespace GPS_Utils {
         String encodedGPS   = APRSPacketLib::encodeGPSIntoBase91(Config.beacon.latitude, Config.beacon.longitude, 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel);
 
         if (Config.callsign.indexOf("NOCALL-10") != 0) {
-            if (!callsignIsValid) {
+            if (!stationCallsignIsValid) {
                 displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
                 Config.loramodule.txActive  = false;
                 Config.aprs_is.messagesToRF = false;
@@ -57,7 +57,7 @@ namespace GPS_Utils {
                 Config.beacon.sendViaRF     = false;
                 Config.digi.mode            = 0;
                 Config.digi.backupDigiMode  = false;
-            } else if (callsignIsValid && Config.tacticalCallsign != "") {
+            } else if (stationCallsignIsValid && Config.tacticalCallsign != "") {
                 beaconPacket = APRSPacketLib::generateBasePacket(Config.tacticalCallsign, "APLRG1", Config.beacon.path);
                 Config.aprs_is.active       = false;
                 Config.beacon.sendViaAPRSIS = false;

src/power_utils.cpp

@@ -44,7 +44,7 @@
 #endif
 
 extern Configuration    Config;
-extern bool             callsignIsValid;
+extern bool             stationCallsignIsValid;
 
 
 namespace POWER_Utils {
@@ -324,7 +324,7 @@ namespace POWER_Utils {
         delay(1000);
         BATTERY_Utils::setup();
         BATTERY_Utils::startupBatteryHealth();
-        callsignIsValid = Utils::checkValidCallsign(Config.callsign);
+        stationCallsignIsValid = Utils::callsignIsValid(Config.callsign);
         setCpuFrequencyMhz(80);
     }
 

src/query_utils.cpp

@@ -49,9 +49,9 @@ namespace QUERY_Utils {
             answer.concat(versionDate);
         } else if (queryQuestion == "?APRSP") {
             answer.concat("iGate QTH: ");
-            answer.concat(String(Config.beacon.latitude,3));
+            answer.concat(String(Config.beacon.latitude,2));
             answer.concat(" ");
-            answer.concat(String(Config.beacon.longitude,3));
+            answer.concat(String(Config.beacon.longitude,2));
         } else if (queryQuestion == "?APRSL") {
             if (lastHeardStations.size() == 0) {
                 char answerArray[50];

src/sleep_utils.cpp

@@ -51,12 +51,13 @@ namespace SLEEP_Utils {
         if (Config.digi.ecoMode == 1) {
             pinMode(RADIO_WAKEUP_PIN, INPUT);
             attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING);
-            #if defined(ESP32) || defined(ESP32_S2) || defined(ESP32_S3)
+
+            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
                 esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
-            #endif
+            #elif defined(CONFIG_IDF_TARGET_ESP32C3)
-            #if defined(ESP32_C3)
                 esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH);
             #endif
+            //#if defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_NRF52)
         }
         #endif
     }

src/utils.cpp

@@ -67,7 +67,7 @@ bool        beaconUpdate        = false;
 uint32_t    lastBeaconTx            = 0;
 uint32_t    lastScreenOn            = millis();
 uint32_t    lastStatusTx            = 0;
-bool        callsignIsValid     = false;
+bool        stationCallsignIsValid  = false;
 String      beaconPacket;
 String      secondaryBeaconPacket;
 
@@ -198,7 +198,7 @@ namespace Utils {
             }
             beaconPacket            += Config.beacon.comment;
             secondaryBeaconPacket   += Config.beacon.comment;
-            if (callsignIsValid && Config.tacticalCallsign != "") {
+            if (stationCallsignIsValid && Config.tacticalCallsign != "") {
                 beaconPacket            += " de ";
                 beaconPacket            += Config.callsign;
                 secondaryBeaconPacket   += " de ";
@@ -415,7 +415,7 @@ namespace Utils {
         }
     }
 
-    bool checkValidCallsign(const String& callsign) {
+    bool callsignIsValid(const String& callsign) {
         if (callsign == "WLNK-1") return true;
 
         String cleanCallsign;

variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
-
     //  LoRa Radio
     #define HAS_SX1268
     #define RADIO_HAS_XTAL

variants/ESP32_DIY_1W_LoRa/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1268
     #define HAS_1W_LORA

variants/ESP32_DIY_1W_LoRa_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_1W_LORA

variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_LLCC68
     #define HAS_1W_LORA

variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1268
     #define HAS_1W_LORA

variants/ESP32_DIY_LoRa/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          5

variants/ESP32_DIY_LoRa_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

variants/ESP32_DIY_LoRa_A7670/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          18

variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          18

variants/LoRaHAM_V2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          36

variants/OE5HWN_MeshCom/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1268
     #define HAS_1W_LORA

variants/QRPLabs_LightGateway_1_0/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1268
     #define RADIO_VCC_PIN           21

variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1268
     #define HAS_1W_LORA

variants/TROY_LoRa_APRS/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN      5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          18

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          15

variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S2
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          36

variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/esp32c3_DIY_1W_LoRa/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
-
     //  LoRa Radio
     #define HAS_SX1268
     #define HAS_1W_LORA

variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_1W_LORA

variants/heltec-lora32-v2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          5

variants/heltec-lora32-v2_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

variants/heltec_ht-ct62/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_C3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_vision_master_e290/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wifi_lora_32_V3/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wifi_lora_32_V3_2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wifi_lora_32_V4/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_bridge/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

variants/heltec_wireless_paper_v1/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_paper_v1_2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_stick/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_stick_lite_v3/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_stick_lite_v3_display/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/heltec_wireless_tracker/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/ttgo-lora32-v21/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          5

variants/ttgo-lora32-v21_915/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1278
     #define RADIO_SCLK_PIN          5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1276
     #define RADIO_SCLK_PIN          5

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

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32
-
     //  LoRa Radio
     #define HAS_SX1268
     #define RADIO_SCLK_PIN          5

variants/ttgo_lora32_t3s3_v1_2/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/ttgo_t_deck_GPS/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO

variants/ttgo_t_deck_plus/board_pinout.h

@@ -19,8 +19,6 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
-    #define ESP32_S3
-
     //  LoRa Radio
     #define HAS_SX1262
     #define HAS_TCXO