cross digi added

richonguzman · Oct 6, 2024 · d6c5741 · d6c5741
1 parent 1063a82
commit d6c5741
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,7 @@ __(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a
 
 ## Timeline (Versions):
 
+- 2024.10.06 Cross Frequency Digirepeater 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.

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
@@ -38,7 +38,7 @@ ________________________________________________________________________________
     #include "A7670_utils.h"
 #endif
 
-String          versionDate             = "2024.10.05";
+String          versionDate             = "2024.10.06";
 Configuration   Config;
 WiFiClient      espClient;
 

diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp
@@ -87,7 +87,9 @@ namespace DIGI_Utils {
                 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
+                    //
                     Serial.println("CrossFreqDigi mode 2");
+                    //
                     return buildPacket(path, packet, thirdParty, true);
                 } else {
                     return "";
@@ -103,24 +105,17 @@ namespace DIGI_Utils {
                     }
                     return "";
                 } else if (path.indexOf("WIDE1-1") == -1 && path.indexOf("WIDE2-") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {    //  CrossFreq Digi
+                    //
                     Serial.println("CrossFreqDigi mode 3");
+                    //
                     return buildPacket(path, packet, thirdParty, true);
                 } else {
                     return "";
                 }
             } else {
                 return "";
             }
-
-        // sin path "," y !thirdParty
-        } else if (temp.indexOf(",") == -1 && !thirdParty && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
-            Serial.println("CrossFreqDigi, sin path , no thirdParty");
-            return buildPacket("", packet, thirdParty, true);
-
-
-        // sin path "," y thirdParty
-        } else if (temp.indexOf(",") == -1 && thirdParty && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
-            Serial.println("sin path,  thirdparty , 125k");
+        } 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 "";