Cansat
/
esp32_Adafruit_GPS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent f14d10148b 460caf00c7
commit d853c17be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Adafruit_GPS.cpp
View File

@ -74,7 +74,7 @@ boolean Adafruit_GPS::parse(char *nmea) {
} }
} }
} else { } else {
return false; return false;
} }
// look for a few common sentences // look for a few common sentences
char *p = nmea; char *p = nmea;
@ -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;
} }
@ -406,7 +415,7 @@ char Adafruit_GPS::read(void) {
// } // }
currentline[lineidx++] = c; currentline[lineidx++] = c;
if (lineidx >= MAXLINELENGTH) if (lineidx >= MAXLINELENGTH)
lineidx = MAXLINELENGTH-1; // ensure there is someplace to put the next received character lineidx = MAXLINELENGTH-1; // ensure there is someplace to put the next received character
if (c == '\n') { if (c == '\n') {
currentline[lineidx] = 0; currentline[lineidx] = 0;
@ -424,7 +433,7 @@ char Adafruit_GPS::read(void) {
//Serial.println("----"); //Serial.println("----");
lineidx = 0; lineidx = 0;
recvdflag = true; recvdflag = true;
recvdTime = millis(); // time we got the end of the string recvdTime = millis(); // time we got the end of the string
} }
return c; return c;
@ -585,7 +594,7 @@ boolean Adafruit_GPS::waitForSentence(const char *wait4me, uint8_t max, boolean
i++; i++;
if (strStartsWith(nmea, wait4me)) if (strStartsWith(nmea, wait4me))
return true; return true;
} }
} }
@ -641,7 +650,7 @@ boolean Adafruit_GPS::LOCUS_ReadStatus(void) {
response++; response++;
parsed[i]=0; parsed[i]=0;
while ((response[0] != ',') && while ((response[0] != ',') &&
(response[0] != '*') && (response[0] != 0)) { (response[0] != '*') && (response[0] != 0)) {
parsed[i] *= 10; parsed[i] *= 10;
char c = response[0]; char c = response[0];
if (isDigit(c)) if (isDigit(c))