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

added mode 3 for digirepeater

This commit is contained in:
richonguzman 2024-08-05 14:37:16 -04:00
parent 1afd039c3f
commit 5553e7ae5c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data_embed/index.html
View File

@ -580,6 +580,9 @@
<option value="2"> <option value="2">
WIDE1 (fill-in) Digi WIDE1 (fill-in) Digi
</option> </option>
<option value="3">
WIDE1 and/or WIDE2 (fill-in) Digi
</option>
</select> </select>
</div> </div>
</div> </div>

12
src/digi_utils.cpp
View File

@ -30,7 +30,15 @@ namespace DIGI_Utils {
if (Config.digi.mode == 2) { if (Config.digi.mode == 2) {
tempPath.replace("WIDE1-1", Config.callsign + "*"); tempPath.replace("WIDE1-1", Config.callsign + "*");
} else if (Config.digi.mode == 3) { } else if (Config.digi.mode == 3) {
tempPath.replace("WIDE2-1", Config.callsign + "*"); if (path.indexOf("WIDE1-1")) {
tempPath.replace("WIDE1-1", Config.callsign + "*");
}
if (path.indexOf("WIDE2-1")) {
tempPath.replace("WIDE2-1", Config.callsign + "*");
}
if (path.indexOf(Config.callsign + "*," + Config.callsign + "*")) {
tempPath.replace(Config.callsign + "*," + Config.callsign + "*", Config.callsign + "*");
}
} }
packetToRepeat += tempPath; packetToRepeat += tempPath;
if (thirdParty) { if (thirdParty) {
@ -51,7 +59,7 @@ namespace DIGI_Utils {
} }
if (temp.indexOf(",") > 2) { // checks for path if (temp.indexOf(",") > 2) { // checks for path
const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
if ((Config.digi.mode == 2 && path.indexOf("WIDE1-1") != - 1) || (Config.digi.mode == 3 && path.indexOf("WIDE2-1") != -1)) { if ((Config.digi.mode == 2 && path.indexOf("WIDE1-1") != - 1) || (Config.digi.mode == 3 && (path.indexOf("WIDE1-1") != - 1 || path.indexOf("WIDE2-1") != -1))) {
return buildPacket(path, packet, thirdParty); return buildPacket(path, packet, thirdParty);
} else { } else {
return ""; return "";