Merge pull request #93 from Dygear/master
Signed latitude_fixed & longitude_fixed based on location.
This commit is contained in:
commit
d853c17be1
|
|
@ -266,13 +266,16 @@ void Adafruit_GPS::parseLat(char *p) {
|
||||||
*/
|
*/
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
boolean Adafruit_GPS::parseLatDir(char *p) {
|
boolean Adafruit_GPS::parseLatDir(char *p) {
|
||||||
if (',' != *p)
|
if (p[0] == 'S') {
|
||||||
{
|
lat = 'S';
|
||||||
if (p[0] == 'S') latitudeDegrees *= -1.0;
|
latitudeDegrees *= -1.0;
|
||||||
if (p[0] == 'N') lat = 'N';
|
latitude_fixed *= -1;
|
||||||
else if (p[0] == 'S') lat = 'S';
|
} else if (p[0] == 'N') {
|
||||||
else if (p[0] == ',') lat = 0;
|
lat = 'N';
|
||||||
else return false;
|
} else if (p[0] == ',') {
|
||||||
|
lat = 0;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -315,11 +318,17 @@ void Adafruit_GPS::parseLon(char *p) {
|
||||||
boolean Adafruit_GPS::parseLonDir(char *p) {
|
boolean Adafruit_GPS::parseLonDir(char *p) {
|
||||||
if (',' != *p)
|
if (',' != *p)
|
||||||
{
|
{
|
||||||
if (p[0] == 'W') longitudeDegrees *= -1.0;
|
if (p[0] == 'W') {
|
||||||
if (p[0] == 'W') lon = 'W';
|
lon = 'W';
|
||||||
else if (p[0] == 'E') lon = 'E';
|
longitudeDegrees *= -1.0;
|
||||||
else if (p[0] == ',') lon = 0;
|
longitude_fixed *= -1;
|
||||||
else return false;
|
} else if (p[0] == 'E') {
|
||||||
|
lon = 'E';
|
||||||
|
} else if (p[0] == ',') {
|
||||||
|
lon = 0;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue