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

Fix merge conflict with #18

This commit is contained in:
Tony DiCola 2014-08-06 14:58:41 -07:00
parent b84816a775 91d1657f31
commit 9378a3d1f3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Adafruit_GPS.cpp
View File

@ -258,7 +258,7 @@ void Adafruit_GPS::begin(uint16_t baud)
delay(10);
}
void Adafruit_GPS::sendCommand(char *str) {
void Adafruit_GPS::sendCommand(const char *str) {
#ifdef __AVR__
if(gpsSwSerial)
gpsSwSerial->println(str);

4
Adafruit_GPS.h
View File

@ -99,7 +99,9 @@ class Adafruit_GPS {
char *lastNMEA(void);
boolean newNMEAreceived();
void common_init(void);
void sendCommand(char *);
void sendCommand(const char *);
void pause(boolean b);
boolean parseNMEA(char *response);