richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-01-28 19:34:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gps distance correction when Overlay is not /

Browse source
This commit is contained in:
richonguzman 2023-08-15 11:51:17 -04:00
parent 09eacd652d
commit 970fface06
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View file

@ -20,7 +20,7 @@
Configuration Config;
WiFiClient espClient;
String versionDate = "2023.08.05";
String versionDate = "2023.08.15";
int myWiFiAPIndex = 0;
int myWiFiAPSize = Config.wifiAPs.size();
WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex];

15
src/gps_utils.cpp
View file

@ -108,7 +108,7 @@ double calculateDistanceTo(double latitude, double longitude) {
}
String decodeEncodedGPS(String packet) {
String GPSPacket = packet.substring(packet.indexOf(":!/")+3);
String GPSPacket = packet.substring(packet.indexOf(":!")+3);
String encodedLatitude = GPSPacket.substring(0,4);
String encodedLongtitude = GPSPacket.substring(4,8);
@ -160,10 +160,15 @@ String getReceivedGPS(String packet) {
}
String getDistance(String packet) {
int gpsIndexEx = packet.indexOf(":!");
int gpsIndexEq = packet.indexOf(":=");
if (gpsIndexEx > 10 || gpsIndexEq > 10) {
if ((gpsIndexEx + 15 == packet.indexOf("G")) || (gpsIndexEx + 15 == packet.indexOf("Q")) || (gpsIndexEq + 15 == packet.indexOf("G")) || (gpsIndexEq + 15 == packet.indexOf("Q"))) {
int encodedBytePosition = 0;
if (packet.indexOf(":!") > 10) {
encodedBytePosition = packet.indexOf(":!") + 14;
}
if (packet.indexOf(":=") > 10) {
encodedBytePosition = packet.indexOf(":=") + 14;
}
if (encodedBytePosition != 0) {
if (String(packet[encodedBytePosition]) == "G" || String(packet[encodedBytePosition]) == "Q") {
return decodeEncodedGPS(packet);
} else {
return getReceivedGPS(packet);