iarv/LoRa_APRS_iGate
1
0
Fork 1
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-05-02 03:22:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing new Syslog Comments info

Browse Source
This commit is contained in:
richonguzman
2024-05-19 23:34:29 -04:00
parent 2496c12763
commit 916cbade8c
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gps_utils.cpp
View File

@@ -66,9 +66,10 @@ namespace GPS_Utils {
}
String decodeEncodedGPS(const String& packet) {
String GPSPacket = packet.substring(packet.indexOf(":!")+3);
String encodedLatitude = GPSPacket.substring(0,4);
String encodedLongtitude = GPSPacket.substring(4,8);
String GPSPacket = packet.substring(packet.indexOf(":!")+3);
String encodedLatitude = GPSPacket.substring(0,4);
String encodedLongtitude = GPSPacket.substring(4,8);
String comment = GPSPacket.substring(13);
int Y1 = int(encodedLatitude[0]);
int Y2 = int(encodedLatitude[1]);
@@ -82,7 +83,11 @@ namespace GPS_Utils {
int X4 = int(encodedLongtitude[3]);
float decodedLongitude = -180.0 + ((((X1-33) * pow(91,3)) + ((X2-33) * pow(91,2)) + ((X3-33) * 91) + X4-33) / 190463.0);
distance = String(calculateDistanceTo(decodedLatitude, decodedLongitude),1);
return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km";
if (comment != "") {
return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km / " + comment;
} else {
return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km";
}
}
String getReceivedGPS(const String& packet) {
@@ -94,6 +99,7 @@ namespace GPS_Utils {
}
String Latitude = infoGPS.substring(0,8);
String Longitude = infoGPS.substring(9,18);
String comment = infoGPS.substring(19);
float convertedLatitude, convertedLongitude;
String firstLatPart = Latitude.substring(0,2);
@@ -114,10 +120,14 @@ namespace GPS_Utils {
convertedLongitude = -convertedLongitude;
}
distance = String(calculateDistanceTo(convertedLatitude, convertedLongitude),1);
return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km";
}
if (comment != "") {
return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km / " + comment;
} else {
return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km";
}
}
String getDistance(const String& packet) {
String getDistanceAndComment(const String& packet) {
uint8_t encodedBytePosition = 0;
if (packet.indexOf(":!") > 10) {
encodedBytePosition = packet.indexOf(":!") + 14;