about info update

common_settings.ini

@@ -34,10 +34,10 @@ lib_deps =
 	bblanchon/ArduinoJson @ 7.4.3
 	jgromes/RadioLib @ 7.6.0
 	knolleary/PubSubClient @ 2.8
-	ESP32Async/AsyncTCP @ 3.4.10
-	ESP32Async/ESPAsyncWebServer @ 3.11.1
-	mikalhart/TinyGPSPlus @ 1.0.3
-	richonguzman/APRSPacketLib @ 1.0.8
+	ESP32Async/AsyncTCP @ 3.5.0
+	ESP32Async/ESPAsyncWebServer @ 3.12.1
+	mikalhart/TinyGPSPlus @ 1.1.0
+	richonguzman/APRSPacketLib @ 1.0.10
 display_libs =
 	adafruit/Adafruit GFX Library @ 1.12.6
 	adafruit/Adafruit SSD1306 @ 2.5.17

data_embed/index.html

@@ -1421,7 +1421,7 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                         <label
                                             for="lora.power"
                                             class="form-label">
-                                            Power
+                                            Power <small>(SX127X Max 20dBm / SX126X Max 22dBm)</small>
                                         </label>
                                         <div class="input-group">
                                             <input
@@ -1429,8 +1429,8 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
                                                 name="lora.power"
                                                 id="lora.power"
                                                 placeholder="20"
-                                                min="0"
-                                                max="20"
+                                                min="2"
+                                                max="22"
                                                 step="1"
                                                 class="form-control"
                                                 required=""
@@ -2467,7 +2467,7 @@ body{background:var(--msh-bg);color:var(--msh-text);font-family:"Inter",system-u
     if(window.fetchReceivedPackets)window.fetchReceivedPackets();
   });
   var bi=document.getElementById("buildInfo");
-  if(bi){var h=bi.innerHTML; if(/Version date/i.test(h)){h=h.replace(/(<br\s*\/?>)[\s\S]*?(?=Version date)/i,"$1");bi.innerHTML="Board / Environment = "+h;}}
+  if(bi){var h=bi.innerHTML; if(/Version date/i.test(h)){h=h.replace(/(<br\s*\/?>)[\s\S]*?(?=Version: )/i,"$1");bi.innerHTML="Board / Environment = "+h;}}
   if(window.loadReceivedPackets){var _o=window.loadReceivedPackets;window.loadReceivedPackets=function(p){if(p&&p.slice){p=p.slice().reverse();}return _o(p);};}
 })();
 </script>

include/lora_utils.h

@@ -24,6 +24,7 @@
 
 namespace LoRa_Utils {
 
+    int     validPower(int requested);
     void    setup();
     void    sendNewPacket(const String& newPacket);
     String  receivePacketFromSleep();

include/query_utils.h

@@ -24,7 +24,8 @@
 
 namespace QUERY_Utils {
 
-    String process(const String& query, const String& station, bool queryFromAPRSIS, bool thirdParty);
+    bool    isQuery(const String& message);
+    String  process(const String& query, const String& station, bool queryFromAPRSIS, bool thirdParty);
 
 }
 

include/utils.h

@@ -40,6 +40,7 @@ namespace Utils {
     void    checkBeaconInterval();
     void    checkDisplayInterval();
     void    validateFreqs();
+    String  padForDisplay(const String& text);
     void    updateLoRaPacketDisplayInfo(APRSPacket& aprsPacket, const uint8_t packetType);
     void    updateAPRSISPacketDisplayInfo(const String& packet);
     void    print(const String& text);

src/A7670_utils.cpp

@@ -197,6 +197,7 @@
         }
 
         void uploadToAPRSIS(const String& packet) {
+            if (packet == "") return;               // never send an empty line to APRS-IS
             beaconBytesSent = checkATResponse("AT+CIPSEND=0," + String(packet.length()+1));
             delay(2000);
             if (beaconBytesSent) {

src/LoRa_APRS_iGate.cpp

@@ -68,8 +68,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-10-04";
-String              versionNumber           = "4.0.2";
+String              versionDate             = "2026-10-05";
+String              versionNumber           = "4.0.3";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;

src/aprs_is_utils.cpp

@@ -60,6 +60,7 @@ uint32_t    lastServerCheck = 0;
 namespace APRS_IS_Utils {
 
     void upload(const String& line) {
+        if (line == "") return;                     // never send an empty line to APRS-IS
         aprsIsClient.print(line + "\r\n");
     }
 
@@ -156,37 +157,19 @@ namespace APRS_IS_Utils {
         int leftCurlyBraceIndex = packet.indexOf("{");
         int colonIndex          = packet.indexOf(":");
         if (leftCurlyBraceIndex > 0) {     // ack?
-            String ackMessage = "ack";
-            ackMessage.concat(packet.substring(leftCurlyBraceIndex + 1));
-            ackMessage.trim();
-            //Serial.println(ackMessage);
-
-            String addToBuffer = Config.callsign;
-            addToBuffer += ">APLRG1";
-            if (lastAprsPacket.header == "") 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);
+            String ackCallsign  = (Config.tacticalCallsign == "") ? Config.callsign : Config.tacticalCallsign;     // ack from the callsign the message was addressed to
+            String ackPath      = (lastAprsPacket.header == "") ? "RFONLY," + Config.beacon.path : Config.beacon.path;
+            String ackPacket    = APRSPacketLib::generateAckPacket(ackCallsign, "APLRG1", ackPath, sender, packet);
+            if (ackPacket != "") STATION_Utils::addToOutputPacketBuffer(ackPacket);
             receivedMessage = packet.substring(colonIndex + 1, leftCurlyBraceIndex);
         } else {
             receivedMessage = packet.substring(colonIndex + 1);
         }
-        if (receivedMessage.indexOf("?") == 0) {
+        if (QUERY_Utils::isQuery(receivedMessage)) {
             if (!Config.display.alwaysOn && Config.display.timeout != 0) displayToggle(true);
 
-            STATION_Utils::addToOutputPacketBuffer(QUERY_Utils::process(receivedMessage, sender, false, lastAprsPacket.header != ""));
+            String queryAnswer = QUERY_Utils::process(receivedMessage, sender, false, lastAprsPacket.header != "");
+            if (queryAnswer != "") STATION_Utils::addToOutputPacketBuffer(queryAnswer);     // unknown query: no answer
             lastScreenOn = millis();
             displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, "Callsign = " + sender, "TYPE --> QUERY", 0);
             return true;
@@ -274,21 +257,9 @@ namespace APRS_IS_Utils {
     }
 
     void processAckMessage(const String& sender, const String& message) {
-        String ackPacket = Config.callsign;
-        ackPacket += ">APLRG1,TCPIP*::";
-
-        String senderCallsign = sender;
-        for (int i = sender.length(); i < 9; i++) {
-            senderCallsign += ' ';
-        }
-        ackPacket += senderCallsign;
-        ackPacket += ":";
-
-        String ackMessage = "ack";
-        ackMessage += message.substring(message.indexOf("{") + 1);
-        ackMessage.trim();
-        ackPacket += ackMessage;
-
+        String ackPacket = APRSPacketLib::generateAckPacket(Config.callsign, "APLRG1", "", sender, message);
+        if (ackPacket == "") return;
+        ackPacket = APRSPacketLib::generateAPRSISPacket(ackPacket);
         #ifdef HAS_A7670
             A7670_Utils::uploadToAPRSIS(ackPacket);
         #else
@@ -314,7 +285,7 @@ namespace APRS_IS_Utils {
                 if (Config.digi.backupDigiMode) lastServerCheck = currentTime;
             } else {
                 int doubleColonIndex = packet.indexOf("::");
-                if (Config.aprs_is.messagesToRF && doubleColonIndex > 0) {
+                if (doubleColonIndex > 0) {     // messages for this station are always answered; messagesToRF only gates forwarding to RF
                     String Sender = packet.substring(0, packet.indexOf(">"));
                     const String& AddresseeAndMessage = packet.substring(doubleColonIndex + 2);
                     int colonIndex = AddresseeAndMessage.indexOf(":");
@@ -329,7 +300,7 @@ namespace APRS_IS_Utils {
                         } else {
                             receivedMessage = AddresseeAndMessage.substring(colonIndex + 1);
                         }
-                        if (receivedMessage.indexOf("?") == 0) {
+                        if (QUERY_Utils::isQuery(receivedMessage)) {
                             Utils::println("Rx Query (APRS-IS)  : " + packet);
                             String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
                             //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
@@ -337,24 +308,23 @@ namespace APRS_IS_Utils {
                                 displayToggle(true);
                             }
                             lastScreenOn = currentTime;
-                            #ifdef HAS_A7670
-                                A7670_Utils::uploadToAPRSIS(queryAnswer);
-                            #else
-                                upload(queryAnswer);
-                            #endif
-                            SYSLOG_Utils::logAPRSISTx(queryAnswer);
-                            fifthLine = "APRS-IS ----> APRS-IS";
-                            sixthLine = Config.callsign;
-                            for (int j = sixthLine.length();j < 9;j++) {
-                                sixthLine += " ";
+                            if (queryAnswer != "") {                                // unknown query: no answer
+                                #ifdef HAS_A7670
+                                    A7670_Utils::uploadToAPRSIS(queryAnswer);
+                                #else
+                                    upload(queryAnswer);
+                                #endif
+                                SYSLOG_Utils::logAPRSISTx(queryAnswer);
                             }
+                            fifthLine = "APRS-IS ----> APRS-IS";
+                            sixthLine = Utils::padForDisplay(Config.callsign);
                             sixthLine += "> ";
                             sixthLine += Sender;
                             seventhLine = "QUERY = ";
                             seventhLine += receivedMessage;
                         }
                         displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-                    } else {
+                    } else if (Config.aprs_is.messagesToRF) {
                         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));

src/lora_utils.cpp

@@ -69,6 +69,18 @@ int rssi, freqError;
 float snr;
 APRSPacket lastAprsPacket;
 
+#if defined(HAS_SX1278) || defined(HAS_SX1276)
+    #define CHIP_MIN_POWER  2       // PA_BOOST (below 2 RadioLib switches to RFO, not wired on most modules)
+    #define CHIP_MAX_POWER  20
+#else                               // SX1262 / SX1268 / LLCC68
+    #define CHIP_MIN_POWER  -9
+    #define CHIP_MAX_POWER  22
+#endif
+
+#ifndef RADIO_MAX_POWER             // optional per board in board_pinout.h (e.g. 1W PA modules)
+    #define RADIO_MAX_POWER CHIP_MAX_POWER
+#endif
+
 
 namespace LoRa_Utils {
 
@@ -85,6 +97,15 @@ namespace LoRa_Utils {
         operationDone = true;
     }
 
+    int validPower(int requested) {
+        const int maxPower = (RADIO_MAX_POWER < CHIP_MAX_POWER) ? RADIO_MAX_POWER : CHIP_MAX_POWER;
+        int power = constrain(requested, CHIP_MIN_POWER, maxPower);
+        #if defined(HAS_SX1278) || defined(HAS_SX1276)
+            if (power > 17 && power < 20) power = 17;   // SX127x PA_BOOST: only 2-17 or 20
+        #endif
+        return power;
+    }
+
     void setup() {
         #if defined (LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0)
             pinMode(RADIO_VCC_PIN,OUTPUT);
@@ -136,16 +157,17 @@ namespace LoRa_Utils {
         radio.setDio2AsRfSwitch(true);
         #endif*/
 
-        #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
+        int power = validPower(Config.loramodule.power);
+        if (power != Config.loramodule.power) {
+            Utils::println("LoRa power adjusted: " + String(Config.loramodule.power) + " -> " + String(power));
+        }
+        state = radio.setOutputPower(power);
+        if (state != RADIOLIB_ERR_NONE) {
+            Utils::println("LoRa setOutputPower failed! State: " + String(state));     // log and keep going
+        }
         #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(120); // OCP ceiling for SX127x: ~120mA needed at +20dBm (not a fixed consumption)
+        #else                           // SX1262 / SX1268 / LLCC68 (also 1W Ebyte E22 / E220 modules)
             radio.setCurrentLimit(140);
         #endif
 
@@ -160,12 +182,7 @@ namespace LoRa_Utils {
             radio.setTCXO(1.8);
         #endif
 
-        if (state == RADIOLIB_ERR_NONE) {
-            Utils::println("init : LoRa Module    ...     done!");
-        } else {
-            Utils::println("Starting LoRa failed! State: " + String(state));
-            while (true);
-        }
+        Utils::println("init : LoRa Module    ...     done!");
     }
 
     void changeFreqTx() {

src/query_utils.cpp

@@ -16,6 +16,7 @@
  * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <APRSPacketLib.h>
 #include "configuration.h"
 #include "battery_utils.h"
 #include "station_utils.h"
@@ -36,11 +37,17 @@ extern String                           versionNumber;
 
 namespace QUERY_Utils {
 
+    bool isQuery(const String& message) {   // "?..." queries, plus "HELP" (any case) without the "?"
+        String queryQuestion = message;
+        queryQuestion.toUpperCase();
+        return queryQuestion.startsWith("?") || queryQuestion == "HELP";
+    }
+
     String process(const String& query, const String& station, bool queryFromAPRSIS, bool thirdParty) {
         String answer;
         String queryQuestion = query;
         queryQuestion.toUpperCase();
-        if (queryQuestion == "?APRS?" || queryQuestion == "H" || queryQuestion == "HELP" || queryQuestion=="?") {
+        if (queryQuestion == "?APRS?" || queryQuestion == "?" || queryQuestion == "HELP") {
             answer.concat("?APRSV ?APRSP ?APRSL ?APRSSR ?EM=? ?TX=? "); // ?APRSH ?WHERE callsign
         } else if (queryQuestion == "?APRSV") {
             answer.concat("CA2RXU_LoRa_iGate v");
@@ -139,32 +146,15 @@ namespace QUERY_Utils {
 
         if (answer == "") return "";
 
-        String queryAnswer = (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
-        queryAnswer += ">APLRG1";
-        if (queryFromAPRSIS) {
-            queryAnswer += ",TCPIP*";
-        } else {
-            if (!thirdParty) queryAnswer += ",RFONLY";
-            if (Config.beacon.path != "") {
-                queryAnswer += ",";
-                queryAnswer += Config.beacon.path;
-            }
-        }
-        queryAnswer += "::";
+        answer += " *";
+        answer += char(random(97, 123));
+        answer += char(random(97, 123));
+        answer += "*";
 
-        String processedStation = station;
-        for (int i = station.length(); i < 9; i++) {
-            processedStation += ' ';
-        }
-        queryAnswer += processedStation;
-        queryAnswer += ":";
-        queryAnswer += answer;
-
-        queryAnswer += " *";
-        queryAnswer += char(random(97, 123));
-        queryAnswer += char(random(97, 123));
-        queryAnswer += "*";
-        return queryAnswer;
+        String queryCallsign    = (Config.tacticalCallsign == "") ? Config.callsign : Config.tacticalCallsign;
+        String queryPath        = queryFromAPRSIS ? "" : (thirdParty ? Config.beacon.path : "RFONLY," + Config.beacon.path);
+        String queryAnswer      = APRSPacketLib::generateMessagePacket(queryCallsign, "APLRG1", queryPath, station, answer);
+        return queryFromAPRSIS ? APRSPacketLib::generateAPRSISPacket(queryAnswer) : queryAnswer;
     }
 
 }

src/station_utils.cpp

@@ -234,6 +234,7 @@ namespace STATION_Utils {
     }
 
     void addToOutputPacketBuffer(const String& packet, bool flag) {
+        if (packet == "") return;                   // never queue an empty packet
         outputPacketBuffer.emplace_back(OutputPacketBuffer{packet, flag});
     }
 

src/utils.cpp

@@ -83,7 +83,8 @@ namespace Utils {
             return;
         }
 
-        String statusPacket = APRSPacketLib::generateStatusPacket(Config.callsign, "APLRG1", Config.beacon.path, Config.beacon.statusPacket);
+        String statusCallsign   = (Config.tacticalCallsign == "") ? Config.callsign : Config.tacticalCallsign;
+        String statusPacket     = APRSPacketLib::generateStatusPacket(statusCallsign, "APLRG1", Config.beacon.path, Config.beacon.statusPacket);
 
         if (sendOverAPRSIS) {
             String aprsisStatusPacket = APRSPacketLib::generateAPRSISPacket(statusPacket);
@@ -322,6 +323,12 @@ namespace Utils {
         }
     }
 
+    String padForDisplay(const String& text) {      // left-aligned, 9 chars wide (callsign column on screen)
+        char buffer[10];
+        snprintf(buffer, sizeof(buffer), "%-9s", text.c_str());
+        return String(buffer);
+    }
+
     void updateLoRaPacketDisplayInfo(APRSPacket& aprsPacket, const uint8_t packetType) {
         switch (packetType) {
             case 0: // LoRa-APRS
@@ -332,11 +339,7 @@ namespace Utils {
                 break;
         }
 
-        String sender = aprsPacket.sender;
-        for (int i = sender.length(); i < 9; i++) {
-            sender += " ";
-        }
-        sixthLine = sender;
+        sixthLine = padForDisplay(aprsPacket.sender);
 
         switch (aprsPacket.type) {
             case 1:     // MESSAGE
@@ -382,11 +385,7 @@ namespace Utils {
     void updateAPRSISPacketDisplayInfo(const String& packet) {
         fifthLine = "APRS-IS ----> LoRa Tx";
 
-        String sender = packet.substring(0,packet.indexOf(">"));
-        for (int i = sender.length(); i < 9; i++) {
-            sender += " ";
-        }
-        sixthLine = sender;
+        sixthLine = padForDisplay(packet.substring(0,packet.indexOf(">")));
 
         if (packet.indexOf("::") > 0) {
             sixthLine += "> MESSAGE";

src/web_utils.cpp

@@ -19,6 +19,7 @@
 #include <ArduinoJson.h>
 #include "network_manager.h"
 #include "configuration.h"
+#include "lora_utils.h"
 #include "ota_utils.h"
 #include "web_utils.h"
 #include "map_utils.h"
@@ -277,7 +278,7 @@ namespace WEB_Utils {
         Config.loramodule.txSpreadingFactor = getParamIntSafe("lora.txSpreadingFactor", Config.loramodule.txSpreadingFactor);
         Config.loramodule.txCodingRate4     = getParamIntSafe("lora.txCodingRate4", Config.loramodule.txCodingRate4);
         Config.loramodule.txSignalBandwidth = getParamIntSafe("lora.txSignalBandwidth", Config.loramodule.txSignalBandwidth);
-        Config.loramodule.power             = getParamIntSafe("lora.power", Config.loramodule.power);
+        Config.loramodule.power             = LoRa_Utils::validPower(getParamIntSafe("lora.power", Config.loramodule.power));  // saved as the power the radio chip really uses
         if (Config.loramodule.txActive)
             Config.loramodule.cadActive     = request->hasParam("lora.cadActive", true);
 

tools/compress.py

@@ -35,16 +35,19 @@ files = [
 ]
 
 string_to_find_str = "String"
-string_to_find_ver = "versionDate"
 
-with open('src/LoRa_APRS_iGate.cpp', encoding='utf-8') as cpp_file:
-  for line in cpp_file:
-    if string_to_find_str in line and string_to_find_ver in line:
-      start = line.find('"') + 1
-      end = line.find('"', start)
-      if start > 0 and end > start:
-        versionDate = line[start:end]
-        break
+def find_string_value(variable_name):
+  with open('src/LoRa_APRS_iGate.cpp', encoding='utf-8') as cpp_file:
+    for line in cpp_file:
+      if string_to_find_str in line and variable_name in line:
+        start = line.find('"') + 1
+        end = line.find('"', start)
+        if start > 0 and end > start:
+          return line[start:end]
+  return ""
+
+versionDate   = find_string_value("versionDate")
+versionNumber = find_string_value("versionNumber")
 
 for src in files:
   out = src + ".gz"
@@ -54,7 +57,7 @@ for src in files:
     content = f.read()
 
   if src == 'data_embed/index.html':
-    env_vars = env["BOARD"] + "<br>" + ','.join(env["BUILD_FLAGS"]).replace('-Werror -Wall,', '').replace(',-DELEGANTOTA_USE_ASYNC_WEBSERVER=1', '') + "<br>" + "Version date: " + versionDate
+    env_vars = env["BOARD"] + "<br>" + ','.join(env["BUILD_FLAGS"]).replace('-Werror -Wall,', '').replace(',-DELEGANTOTA_USE_ASYNC_WEBSERVER=1', '') + "<br>" + "Version: " + versionNumber + "<br>" + "Version date: " + versionDate
     current_date = datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S') + " UTC"
     build_info = f'{env_vars}<br>Build date: {current_date}'.encode()
 

variants/ESP32_9M2IBR_1W_LoRa_GPS_E22_400M30S/platformio.ini

@@ -9,4 +9,4 @@ build_flags =
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
-	adafruit/Adafruit SH110X @ 2.1.10
+	adafruit/Adafruit SH110X @ 2.1.15

variants/QRPLabs_LightGateway_Plus_1_0/platformio.ini

@@ -11,4 +11,4 @@ build_flags =
 lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
-	adafruit/Adafruit SHTC3 Library @ 1.0.1
+	adafruit/Adafruit SHTC3 Library @ 1.0.2

variants/ttgo_t_beam_s3_SUPREME_v3/platformio.ini

@@ -12,4 +12,4 @@ lib_deps =
   	${common.lib_deps}
 	${common.display_libs}
   	lewisxhe/XPowersLib @ 0.2.4
-	adafruit/Adafruit SH110X @ 2.1.10
+	adafruit/Adafruit SH110X @ 2.1.15