diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index fda9646..cf52980 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -38,7 +38,7 @@ ________________________________________________________________________________ #include "A7670_utils.h" #endif -String versionDate = "2024.08.02"; +String versionDate = "2024.08.03"; Configuration Config; WiFiClient espClient; @@ -163,7 +163,7 @@ void loop() { APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS } - if (Config.digi.mode == 2 || backUpDigiMode) { // If Digi enabled + if (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode) { // If Digi enabled STATION_Utils::clean25SegBuffer(); DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi } diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp index 804e93d..ae8b1af 100644 --- a/src/digi_utils.cpp +++ b/src/digi_utils.cpp @@ -27,7 +27,11 @@ namespace DIGI_Utils { String buildPacket(const String& path, const String& packet, bool thirdParty) { String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1); String tempPath = path; - tempPath.replace(Config.beacon.path, Config.callsign + "*"); + if (Config.digi.mode == 2) { + tempPath.replace("WIDE1-1", Config.callsign + "*"); + } else if (Config.digi.mode == 3) { + tempPath.replace("WIDE2-1", Config.callsign + "*"); + } packetToRepeat += tempPath; if (thirdParty) { packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":}"))); @@ -47,7 +51,7 @@ namespace DIGI_Utils { } if (temp.indexOf(",") > 2) { // checks for path const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall - if (path.indexOf(Config.beacon.path) != -1) { + if ((Config.digi.mode == 2 && path.indexOf("WIDE1-1") != - 1) || (Config.digi.mode == 3 && path.indexOf("WIDE2-1") != -1)) { return buildPacket(path, packet, thirdParty); } else { return "";