From 1afe1df764ada08eb8f639f0d8b7c6aeca3502ef Mon Sep 17 00:00:00 2001 From: Rick Sellens Date: Wed, 29 Jan 2020 13:10:43 -0500 Subject: [PATCH] clang --- src/Adafruit_GPS.h | 11 +++++------ src/NMEA_data.cpp | 8 ++++---- src/NMEA_parse.cpp | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Adafruit_GPS.h b/src/Adafruit_GPS.h index d6300ac..fe9baee 100644 --- a/src/Adafruit_GPS.h +++ b/src/Adafruit_GPS.h @@ -34,7 +34,7 @@ #define NMEA_EXTENSIONS ///< if defined will include more NMEA sentences #endif #else -#if(NMEA_EXTRAS > 0) +#if (NMEA_EXTRAS > 0) #define NMEA_EXTENSIONS ///< if defined will include more NMEA sentences #endif #endif @@ -247,8 +247,8 @@ private: bool isEmpty(char *pStart); // used by check() for validity tests, room for future expansion - const char *sources[6] = {"II", "WI", "GP", - "GN", "P", "ZZZ"}; ///< valid source ids + const char *sources[6] = {"II", "WI", "GP", + "GN", "P", "ZZZ"}; ///< valid source ids #ifdef NMEA_EXTENSIONS const char *sentences_parsed[20] = @@ -260,9 +260,8 @@ private: "APB", "DPT", "GSV", "HDG", "MWD", "ROT", "RPM", "RSA", "VDR", "VTG", "ZDA", "ZZZ"}; ///< known, but not parseable #else // make the lists short to save memory - const char - *sentences_parsed[5] = {"GGA", "GLL", "GSA", "RMC", - "ZZZ"}; ///< parseable sentence ids + const char *sentences_parsed[5] = {"GGA", "GLL", "GSA", "RMC", + "ZZZ"}; ///< parseable sentence ids const char *sentences_known[4] = {"DBT", "HDM", "HDT", "ZZZ"}; ///< known, but not parseable #endif diff --git a/src/NMEA_data.cpp b/src/NMEA_data.cpp index 6a76200..d3d05ed 100644 --- a/src/NMEA_data.cpp +++ b/src/NMEA_data.cpp @@ -58,7 +58,7 @@ void Adafruit_GPS::newDataValue(nmea_index_t idx, nmea_float_t v) { newDataValue((nmea_index_t)(idx + 2), cos(v / RAD_TO_DEG)); } // weighting factor for smoothing depends on delta t / tau - nmea_float_t w = + nmea_float_t w = min((nmea_float_t)1.0, ((nmea_float_t)millis() - val[idx].lastUpdate) / val[idx].response); // default smoothing @@ -438,7 +438,7 @@ void Adafruit_GPS::removeHistory(nmea_index_t idx) { /**************************************************************************/ void Adafruit_GPS::showDataValue(nmea_index_t idx, int n) { Serial.print("idx: "); - if(idx < 10) + if (idx < 10) Serial.print(" "); Serial.print(idx); Serial.print(", "); @@ -461,8 +461,8 @@ void Adafruit_GPS::showDataValue(nmea_index_t idx, int n) { Serial.print(" second intervals: "); Serial.print(val[idx].hist->data[val[idx].hist->n - 1]); for (unsigned i = val[idx].hist->n - 2; - i >= max(val[idx].hist->n - n, (unsigned)0); - i--) { // most recent first + i >= max(val[idx].hist->n - n, (unsigned)0); + i--) { // most recent first Serial.print(", "); Serial.print(val[idx].hist->data[i]); } diff --git a/src/NMEA_parse.cpp b/src/NMEA_parse.cpp index 36e2621..61d572a 100644 --- a/src/NMEA_parse.cpp +++ b/src/NMEA_parse.cpp @@ -700,9 +700,9 @@ bool Adafruit_GPS::parseCoord(char *pStart, nmea_float_t *angleDegrees, // reject angles that are out of range if (nsew == 'N' || nsew == 'S') - if(abs(deg) > 90) + if (abs(deg) > 90) return false; - if(abs(deg) > 180) + if (abs(deg) > 180) return false; // store in locations passed as args