clang hates trailing white space
This commit is contained in:
parent
0051f37600
commit
c006654469
|
|
@ -323,7 +323,9 @@ boolean Adafruit_GPS::parseFix(char *p) {
|
||||||
@return nmea_float_t value in seconds since last fix.
|
@return nmea_float_t value in seconds since last fix.
|
||||||
*/
|
*/
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
nmea_float_t Adafruit_GPS::secondsSinceFix() { return (millis() - lastFix) / 1000.; }
|
nmea_float_t Adafruit_GPS::secondsSinceFix() {
|
||||||
|
return (millis() - lastFix) / 1000.;
|
||||||
|
}
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
/*!
|
/*!
|
||||||
|
|
@ -332,7 +334,9 @@ nmea_float_t Adafruit_GPS::secondsSinceFix() { return (millis() - lastFix) / 100
|
||||||
@return nmea_float_t value in seconds since last GPS time.
|
@return nmea_float_t value in seconds since last GPS time.
|
||||||
*/
|
*/
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
nmea_float_t Adafruit_GPS::secondsSinceTime() { return (millis() - lastTime) / 1000.; }
|
nmea_float_t Adafruit_GPS::secondsSinceTime() {
|
||||||
|
return (millis() - lastTime) / 1000.;
|
||||||
|
}
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
/*!
|
/*!
|
||||||
|
|
@ -341,7 +345,9 @@ nmea_float_t Adafruit_GPS::secondsSinceTime() { return (millis() - lastTime) / 1
|
||||||
@return nmea_float_t value in seconds since last GPS date.
|
@return nmea_float_t value in seconds since last GPS date.
|
||||||
*/
|
*/
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
nmea_float_t Adafruit_GPS::secondsSinceDate() { return (millis() - lastDate) / 1000.; }
|
nmea_float_t Adafruit_GPS::secondsSinceDate() {
|
||||||
|
return (millis() - lastDate) / 1000.;
|
||||||
|
}
|
||||||
|
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
|
|
@ -53,10 +53,10 @@
|
||||||
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL)
|
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL)
|
||||||
#include <SoftwareSerial.h>
|
#include <SoftwareSerial.h>
|
||||||
#endif
|
#endif
|
||||||
#include <SPI.h>
|
|
||||||
#include <Wire.h>
|
|
||||||
#include <NMEA_data.h>
|
#include <NMEA_data.h>
|
||||||
#include <Adafruit_PMTK.h>
|
#include <Adafruit_PMTK.h>
|
||||||
|
#include <SPI.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
|
||||||
/// type for resulting code from running check()
|
/// type for resulting code from running check()
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
@ -129,10 +129,10 @@ public:
|
||||||
uint8_t month; ///< GMT month
|
uint8_t month; ///< GMT month
|
||||||
uint8_t day; ///< GMT day
|
uint8_t day; ///< GMT day
|
||||||
|
|
||||||
nmea_float_t latitude; ///< Floating point latitude value in degrees/minutes as
|
nmea_float_t latitude; ///< Floating point latitude value in degrees/minutes
|
||||||
///< received from the GPS (DDMM.MMMM)
|
///< as received from the GPS (DDMM.MMMM)
|
||||||
nmea_float_t longitude; ///< Floating point longitude value in degrees/minutes as
|
nmea_float_t longitude; ///< Floating point longitude value in degrees/minutes
|
||||||
///< received from the GPS (DDDMM.MMMM)
|
///< as received from the GPS (DDDMM.MMMM)
|
||||||
|
|
||||||
/** Fixed point latitude and longitude value with degrees stored in units of
|
/** Fixed point latitude and longitude value with degrees stored in units of
|
||||||
1/100000 degrees, and minutes stored in units of 1/100000 degrees. See pull
|
1/100000 degrees, and minutes stored in units of 1/100000 degrees. See pull
|
||||||
|
|
@ -148,12 +148,12 @@ public:
|
||||||
nmea_float_t speed; ///< Current speed over ground in knots
|
nmea_float_t speed; ///< Current speed over ground in knots
|
||||||
nmea_float_t angle; ///< Course in degrees from true north
|
nmea_float_t angle; ///< Course in degrees from true north
|
||||||
nmea_float_t magvariation; ///< Magnetic variation in degrees (vs. true north)
|
nmea_float_t magvariation; ///< Magnetic variation in degrees (vs. true north)
|
||||||
nmea_float_t HDOP; ///< Horizontal Dilution of Precision - relative accuracy of
|
nmea_float_t HDOP; ///< Horizontal Dilution of Precision - relative accuracy
|
||||||
///< horizontal position
|
///< of horizontal position
|
||||||
nmea_float_t VDOP; ///< Vertical Dilution of Precision - relative accuracy of
|
nmea_float_t VDOP; ///< Vertical Dilution of Precision - relative accuracy
|
||||||
///< vertical position
|
///< of vertical position
|
||||||
nmea_float_t PDOP; ///< Position Dilution of Precision - Complex maths derives a
|
nmea_float_t PDOP; ///< Position Dilution of Precision - Complex maths derives
|
||||||
///< simple, single number for each kind of DOP
|
///< a simple, single number for each kind of DOP
|
||||||
char lat = 'X'; ///< N/S
|
char lat = 'X'; ///< N/S
|
||||||
char lon = 'X'; ///< E/W
|
char lon = 'X'; ///< E/W
|
||||||
char mag = 'X'; ///< Magnetic variation direction
|
char mag = 'X'; ///< Magnetic variation direction
|
||||||
|
|
|
||||||
|
|
@ -95,12 +95,10 @@ typedef struct {
|
||||||
nmea_float_t smoothed =
|
nmea_float_t smoothed =
|
||||||
0.0; ///< smoothed value based on weight of dt/response
|
0.0; ///< smoothed value based on weight of dt/response
|
||||||
uint32_t lastUpdate = 0; ///< millis() when latest was last set
|
uint32_t lastUpdate = 0; ///< millis() when latest was last set
|
||||||
uint16_t response =
|
uint16_t response = 1000; ///< time constant in millis for smoothing
|
||||||
1000; ///< time constant in millis for smoothing
|
|
||||||
nmea_value_type_t type =
|
nmea_value_type_t type =
|
||||||
NMEA_SIMPLE_FLOAT; ///< type of float data value represented
|
NMEA_SIMPLE_FLOAT; ///< type of float data value represented
|
||||||
byte ockam =
|
byte ockam = 0; ///< the corresponding Ockam Instruments tag number, 0-128
|
||||||
0; ///< the corresponding Ockam Instruments tag number, 0-128
|
|
||||||
nmea_history_t *hist = NULL; ///< pointer to history, if any
|
nmea_history_t *hist = NULL; ///< pointer to history, if any
|
||||||
char *label = NULL; ///< pointer to quantity label, if any
|
char *label = NULL; ///< pointer to quantity label, if any
|
||||||
char *unit = NULL; ///< pointer to units label, if any
|
char *unit = NULL; ///< pointer to units label, if any
|
||||||
|
|
|
||||||
|
|
@ -229,4 +229,3 @@ boolean Adafruit_GPS::parse(char *nmea) {
|
||||||
lastUpdate = millis();
|
lastUpdate = millis();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue