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

RNAAAA add + WIDE2 description in index

This commit is contained in:
richonguzman 2024-08-05 15:20:58 -04:00
parent 5553e7ae5c
commit b763b4af78
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data_embed/index.html
View File

@ -581,7 +581,7 @@
WIDE1 (fill-in) Digi WIDE1 (fill-in) Digi
</option> </option>
<option value="3"> <option value="3">
WIDE1 and/or WIDE2 (fill-in) Digi WIDE2 (+WIDE1) (fill-in) Digi
</option> </option>
</select> </select>
</div> </div>

8
src/utils.cpp
View File

@ -348,17 +348,21 @@ namespace Utils {
cleanCallsign = " " + cleanCallsign; // A0AA --> _A0AA cleanCallsign = " " + cleanCallsign; // A0AA --> _A0AA
} }
if (!isDigit(cleanCallsign[2]) || !isAlpha(cleanCallsign[3])) return false; // __0A must be validated if (!isDigit(cleanCallsign[2]) || !isAlpha(cleanCallsign[3])) { // __0A__ must be validated
if (cleanCallsign[0] != 'R' && !isDigit(cleanCallsign[1]) && !isAlpha(cleanCallsign[2])) return false; // to accepto R0A___
}
bool isValid = false; bool isValid = false;
if ((isAlphaNumeric(cleanCallsign[0]) || cleanCallsign[0] == ' ') && isAlpha(cleanCallsign[1])) { if ((isAlphaNumeric(cleanCallsign[0]) || cleanCallsign[0] == ' ') && isAlpha(cleanCallsign[1])) {
isValid = true; // AA0A (+A+A) + _A0AA (+A) + 0A0A (+A+A) isValid = true; // AA0A (+A+A) + _A0AA (+A) + 0A0A (+A+A)
} else if (isAlpha(cleanCallsign[0]) && isDigit(cleanCallsign[1])) { } else if (isAlpha(cleanCallsign[0]) && isDigit(cleanCallsign[1])) {
isValid = true; // A00A (+A+A) isValid = true; // A00A (+A+A)
} else if (cleanCallsign[0] == 'R' && cleanCallsign.length() == 6 && isDigit(cleanCallsign[1]) && isAlpha(cleanCallsign[2]) && isAlpha(cleanCallsign[3]) && isAlpha(cleanCallsign[4])) {
isValid = true; // R0AA (+A+A)
} }
if (!isValid) return false; // also 00__ avoided if (!isValid) return false; // also 00__ avoided
if (cleanCallsign.length() > 4) { if (cleanCallsign.length() > 4) { // to validate ____AA
for (int i = 5; i <= cleanCallsign.length(); i++) { for (int i = 5; i <= cleanCallsign.length(); i++) {
if (!isAlpha(cleanCallsign[i - 1])) return false; if (!isAlpha(cleanCallsign[i - 1])) return false;
} }