richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-02-10 17:56:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

testing state

Browse source
This commit is contained in:
richonguzman 2024-06-08 13:57:58 -04:00
parent d04b009a49
commit 0f5330141f
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View file

@ -37,7 +37,7 @@ ________________________________________________________________________________
#include "A7670_utils.h"
#endif
String versionDate = "2024.06.07";
String versionDate = "2024.06.08";
Configuration Config;
WiFiClient espClient;

13
src/utils.cpp
View file

@ -342,20 +342,16 @@ namespace Utils {
} else {
cleanCallsign = callsign;
}
if (cleanCallsign.length() < 4 || cleanCallsign.length() > 6) {
return false;
}
if (cleanCallsign.length() < 4 || cleanCallsign.length() > 6) return false;
if (isDigit(cleanCallsign[1]) && cleanCallsign.length() < 6 && cleanCallsign.indexOf("S5") != 0 && cleanCallsign.indexOf("E7") != 0 && cleanCallsign.indexOf("Z3") != 0) {
cleanCallsign = " " + cleanCallsign; // ANAA --> _ANAA
}
if (cleanCallsign.indexOf("S5") == 0 || cleanCallsign.indexOf("E7") == 0 || cleanCallsign.indexOf("Z3") == 0) {
if (!isDigit(cleanCallsign[2]) && !isAlpha(cleanCallsign[3])) {
return false;
}
if (!isDigit(cleanCallsign[2]) && !isAlpha(cleanCallsign[3])) return false;
} else {
if (!isAlphaNumeric(cleanCallsign[1]) && !isDigit(cleanCallsign[2]) && !isAlpha(cleanCallsign[3])) {
if (!isAlphaNumeric(cleanCallsign[1]) || !isDigit(cleanCallsign[2]) || !isAlpha(cleanCallsign[3])) {
return false;
}
}
@ -373,8 +369,7 @@ namespace Utils {
4 E = _ or alpha
5 F = _ or alpha
XX = 0 - 15
*/
XX = SSID = _ or 0 - 15 */
return true;
}