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

clang

This commit is contained in:
Rick Sellens 2020-01-19 09:15:18 -05:00
parent c006654469
commit 8c3bdfd0ca
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Adafruit_GPS.cpp
View File

@ -325,7 +325,7 @@ boolean Adafruit_GPS::parseFix(char *p) {
/**************************************************************************/ /**************************************************************************/
nmea_float_t Adafruit_GPS::secondsSinceFix() { nmea_float_t Adafruit_GPS::secondsSinceFix() {
return (millis() - lastFix) / 1000.; return (millis() - lastFix) / 1000.;
} }
/**************************************************************************/ /**************************************************************************/
/*! /*!
@ -336,7 +336,7 @@ nmea_float_t Adafruit_GPS::secondsSinceFix() {
/**************************************************************************/ /**************************************************************************/
nmea_float_t Adafruit_GPS::secondsSinceTime() { nmea_float_t Adafruit_GPS::secondsSinceTime() {
return (millis() - lastTime) / 1000.; return (millis() - lastTime) / 1000.;
} }
/**************************************************************************/ /**************************************************************************/
/*! /*!
@ -347,7 +347,7 @@ nmea_float_t Adafruit_GPS::secondsSinceTime() {
/**************************************************************************/ /**************************************************************************/
nmea_float_t Adafruit_GPS::secondsSinceDate() { nmea_float_t Adafruit_GPS::secondsSinceDate() {
return (millis() - lastDate) / 1000.; return (millis() - lastDate) / 1000.;
} }
/**************************************************************************/ /**************************************************************************/
/*! /*!

14
src/Adafruit_GPS.h
View File

@ -53,8 +53,8 @@
#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 <NMEA_data.h>
#include <Adafruit_PMTK.h> #include <Adafruit_PMTK.h>
#include <NMEA_data.h>
#include <SPI.h> #include <SPI.h>
#include <Wire.h> #include <Wire.h>
@ -130,9 +130,9 @@ public:
uint8_t day; ///< GMT day uint8_t day; ///< GMT day
nmea_float_t latitude; ///< Floating point latitude value in degrees/minutes nmea_float_t latitude; ///< Floating point latitude value in degrees/minutes
///< as received from the GPS (DDMM.MMMM) ///< as received from the GPS (DDMM.MMMM)
nmea_float_t longitude; ///< Floating point longitude value in degrees/minutes nmea_float_t longitude; ///< Floating point longitude value in degrees/minutes
///< as 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
@ -154,10 +154,10 @@ public:
///< of vertical position ///< of vertical position
nmea_float_t PDOP; ///< Position Dilution of Precision - Complex maths derives nmea_float_t PDOP; ///< Position Dilution of Precision - Complex maths derives
///< a 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
boolean fix; ///< Have a fix? boolean fix; ///< Have a fix?
uint8_t fixquality; ///< Fix quality (0, 1, 2 = Invalid, GPS, DGPS) uint8_t fixquality; ///< Fix quality (0, 1, 2 = Invalid, GPS, DGPS)
uint8_t fixquality_3d; ///< 3D fix quality (1, 3, 3 = Nofix, 2D fix, 3D fix) uint8_t fixquality_3d; ///< 3D fix quality (1, 3, 3 = Nofix, 2D fix, 3D fix)
uint8_t satellites; ///< Number of satellites in use uint8_t satellites; ///< Number of satellites in use