From 4348639804ce8dc90672e0d4dc48466c6a5e7e2f Mon Sep 17 00:00:00 2001 From: Larry Date: Sun, 19 Oct 2014 11:30:28 +1300 Subject: [PATCH 1/2] Fix warning about reaching end of non-void function. --- Adafruit_GPS.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Adafruit_GPS.cpp b/Adafruit_GPS.cpp index 3bca0de..62422cc 100755 --- a/Adafruit_GPS.cpp +++ b/Adafruit_GPS.cpp @@ -382,6 +382,8 @@ uint8_t Adafruit_GPS::parseHex(char c) { return 0; if (c <= 'F') return (c - 'A')+10; + // if (c > 'F') + return 0; } boolean Adafruit_GPS::waitForSentence(char *wait4me, uint8_t max) { From c85ca305f99c35f88476ef1992dbe040d928178d Mon Sep 17 00:00:00 2001 From: Larry Date: Sun, 19 Oct 2014 11:31:07 +1300 Subject: [PATCH 2/2] Fix warning about deprecated cast from string to char *. --- Adafruit_GPS.cpp | 2 +- Adafruit_GPS.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_GPS.cpp b/Adafruit_GPS.cpp index 62422cc..7b5ac95 100755 --- a/Adafruit_GPS.cpp +++ b/Adafruit_GPS.cpp @@ -386,7 +386,7 @@ uint8_t Adafruit_GPS::parseHex(char c) { return 0; } -boolean Adafruit_GPS::waitForSentence(char *wait4me, uint8_t max) { +boolean Adafruit_GPS::waitForSentence(const char *wait4me, uint8_t max) { char str[20]; uint8_t i=0; diff --git a/Adafruit_GPS.h b/Adafruit_GPS.h index a417255..5d513ad 100755 --- a/Adafruit_GPS.h +++ b/Adafruit_GPS.h @@ -140,7 +140,7 @@ class Adafruit_GPS { boolean fix; uint8_t fixquality, satellites; - boolean waitForSentence(char *wait, uint8_t max = MAXWAITSENTENCE); + boolean waitForSentence(const char *wait, uint8_t max = MAXWAITSENTENCE); boolean LOCUS_StartLogger(void); boolean LOCUS_StopLogger(void); boolean LOCUS_ReadStatus(void);