ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cross digi added

This commit is contained in:
richonguzman 2024-10-06 11:36:37 -03:00
parent 1063a82294
commit d6c5741fde
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -47,6 +47,7 @@ __(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a
## Timeline (Versions): ## Timeline (Versions):
- 2024.10.06 Cross Frequency Digirepeater Rules added.
- 2024.09.23 Libraries Update for SDK3 - 2024.09.23 Libraries Update for SDK3
- 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet. - 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet.
- 2024.08.23 Wemos S2 Mini DIY LoRa added. - 2024.08.23 Wemos S2 Mini DIY LoRa added.

2
src/LoRa_APRS_iGate.cpp
View File

@ -38,7 +38,7 @@ ________________________________________________________________________________
#include "A7670_utils.h" #include "A7670_utils.h"
#endif #endif
String versionDate = "2024.10.05"; String versionDate = "2024.10.06";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;

15
src/digi_utils.cpp
View File

@ -87,7 +87,9 @@ namespace DIGI_Utils {
if (path.indexOf("WIDE1-1") != - 1) { if (path.indexOf("WIDE1-1") != - 1) {
return buildPacket(path, packet, thirdParty, false); return buildPacket(path, packet, thirdParty, false);
} else if (path.indexOf("WIDE1-1") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { // CrossFreq Digi } else if (path.indexOf("WIDE1-1") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { // CrossFreq Digi
//
Serial.println("CrossFreqDigi mode 2"); Serial.println("CrossFreqDigi mode 2");
//
return buildPacket(path, packet, thirdParty, true); return buildPacket(path, packet, thirdParty, true);
} else { } else {
return ""; return "";
@ -103,7 +105,9 @@ namespace DIGI_Utils {
} }
return ""; return "";
} else if (path.indexOf("WIDE1-1") == -1 && path.indexOf("WIDE2-") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { // CrossFreq Digi } 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"); Serial.println("CrossFreqDigi mode 3");
//
return buildPacket(path, packet, thirdParty, true); return buildPacket(path, packet, thirdParty, true);
} else { } else {
return ""; return "";
@ -111,16 +115,7 @@ namespace DIGI_Utils {
} else { } else {
return ""; return "";
} }
} else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
// 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");
return buildPacket("", packet, thirdParty, true); return buildPacket("", packet, thirdParty, true);
} else { } else {
return ""; return "";