Merge pull request #93 from Dygear/master

Signed latitude_fixed & longitude_fixed based on location.
This commit is contained in:
Matt Goodrich 2019-06-25 16:28:14 -04:00 committed by GitHub
commit d853c17be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions

View File

@ -266,13 +266,16 @@ void Adafruit_GPS::parseLat(char *p) {
*/
/**************************************************************************/
boolean Adafruit_GPS::parseLatDir(char *p) {
if (',' != *p)
{
if (p[0] == 'S') latitudeDegrees *= -1.0;
if (p[0] == 'N') lat = 'N';
else if (p[0] == 'S') lat = 'S';
else if (p[0] == ',') lat = 0;
else return false;
if (p[0] == 'S') {
lat = 'S';
latitudeDegrees *= -1.0;
latitude_fixed *= -1;
} else if (p[0] == 'N') {
lat = 'N';
} else if (p[0] == ',') {
lat = 0;
} else {
return false;
}
return true;
}
@ -315,11 +318,17 @@ void Adafruit_GPS::parseLon(char *p) {
boolean Adafruit_GPS::parseLonDir(char *p) {
if (',' != *p)
{
if (p[0] == 'W') longitudeDegrees *= -1.0;
if (p[0] == 'W') lon = 'W';
else if (p[0] == 'E') lon = 'E';
else if (p[0] == ',') lon = 0;
else return false;
if (p[0] == 'W') {
lon = 'W';
longitudeDegrees *= -1.0;
longitude_fixed *= -1;
} else if (p[0] == 'E') {
lon = 'E';
} else if (p[0] == ',') {
lon = 0;
} else {
return false;
}
}
return true;
}