Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit fa216ad

Browse files
authored
Merge branch 'master' into multiSetVal-(Issue-#20-#21-#23)
2 parents 21379f4 + e2ddf9e commit fa216ad

File tree

2 files changed

+48
-30
lines changed

2 files changed

+48
-30
lines changed

ISSUE_TEMPLATE.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
### Subject of the issue
2+
Describe your issue here. If you reference a datasheet please specify which one and in which section (ie, the protocol manual, section 5.1.2). Additionally, screenshots are easy to paste into github.
3+
4+
### Your workbench
5+
* What development board or microcontroller are you using?
6+
* What version of hardware or breakout board are you using?
7+
* How is the breakout board wired to your microcontroller?
8+
* How is everything being powered?
9+
* Are there any additional details that may help us help you?
10+
11+
### Steps to reproduce
12+
Tell us how to reproduce this issue. Please post stripped down example code demonstrating your issue.
13+
14+
### Expected behavior
15+
Tell us what should happen
16+
17+
### Actual behavior
18+
Tell us what happens instead

src/SparkFun_Ublox_Arduino_Library.h

+30-30
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ class SFE_UBLOX_GPS
239239

240240
boolean setAutoPVT(boolean enabled, uint16_t maxWait = 250); //Enable/disable automatic PVT reports at the navigation frequency
241241
boolean getPVT(uint16_t maxWait = 1000); //Query module for latest group of datums and load global vars: lat, long, alt, speed, SIV, accuracies, etc. If autoPVT is disabled, performs an explicit poll and waits, if enabled does not block. Retruns true if new PVT is available.
242-
boolean getHPPOSLLH(uint16_t maxWait = 1000); //Query module for latest group of datums and load global vars: lat, long, alt, speed, SIV, accuracies, etc. If autoPVT is disabled, performs an explicit poll and waits, if enabled does not block. Retruns true if new PVT is available.
243-
242+
boolean getHPPOSLLH(uint16_t maxWait = 1000); //Query module for latest group of datums and load global vars: lat, long, alt, speed, SIV, accuracies, etc. If autoPVT is disabled, performs an explicit poll and waits, if enabled does not block. Retruns true if new PVT is available.
243+
244244
int32_t getLatitude(uint16_t maxWait = 250); //Returns the current latitude in degrees * 10^-7. Auto selects between HighPrecision and Regular depending on ability of module.
245245
int32_t getLongitude(uint16_t maxWait = 250); //Returns the current longitude in degrees * 10-7. Auto selects between HighPrecision and Regular depending on ability of module.
246246
int32_t getAltitude(uint16_t maxWait = 250); //Returns the current altitude in mm above ellipsoid
@@ -258,14 +258,14 @@ class SFE_UBLOX_GPS
258258
uint8_t getMinute(uint16_t maxWait = 250);
259259
uint8_t getSecond(uint16_t maxWait = 250);
260260

261-
uint32_t getTimeOfWeek(uint16_t maxWait = 250);
262-
int32_t getHighResLatitude(uint16_t maxWait = 250);
263-
int32_t getHighResLongitude(uint16_t maxWait = 250);
264-
int32_t getElipsoid(uint16_t maxWait = 250);
265-
int32_t getMeanSeaLevel(uint16_t maxWait = 250);
266-
int32_t getGeoidSeparation(uint16_t maxWait = 250);
267-
uint32_t getHorizontalAccuracy(uint16_t maxWait = 250);
268-
uint32_t getVerticalAccuracy(uint16_t maxWait = 250);
261+
uint32_t getTimeOfWeek(uint16_t maxWait = 250);
262+
int32_t getHighResLatitude(uint16_t maxWait = 250);
263+
int32_t getHighResLongitude(uint16_t maxWait = 250);
264+
int32_t getElipsoid(uint16_t maxWait = 250);
265+
int32_t getMeanSeaLevel(uint16_t maxWait = 250);
266+
int32_t getGeoidSeparation(uint16_t maxWait = 250);
267+
uint32_t getHorizontalAccuracy(uint16_t maxWait = 250);
268+
uint32_t getVerticalAccuracy(uint16_t maxWait = 250);
269269

270270
//Port configurations
271271
boolean setPortOutput(uint8_t portID, uint8_t comSettings, uint16_t maxWait = 250); //Configure a given port to output UBX, NMEA, RTCM3 or a combination thereof
@@ -376,14 +376,14 @@ class SFE_UBLOX_GPS
376376
uint8_t versionLow; //Loaded from getProtocolVersion().
377377
uint8_t versionHigh;
378378

379-
uint32_t timeOfWeek;
380-
int32_t highResLatitude;
381-
int32_t highResLongitude;
382-
int32_t elipsoid;
383-
int32_t meanSeaLevel;
384-
int32_t geoidSeparation;
385-
uint32_t horizontalAccuracy;
386-
uint32_t verticalAccuracy;
379+
uint32_t timeOfWeek;
380+
int32_t highResLatitude;
381+
int32_t highResLongitude;
382+
int32_t elipsoid;
383+
int32_t meanSeaLevel;
384+
int32_t geoidSeparation;
385+
uint32_t horizontalAccuracy;
386+
uint32_t verticalAccuracy;
387387

388388
uint16_t rtcmFrameCounter = 0; //Tracks the type of incoming byte inside RTCM frame
389389

@@ -473,18 +473,18 @@ class SFE_UBLOX_GPS
473473
uint16_t versionNumber : 1;
474474
} moduleQueried;
475475

476-
struct
477-
{
478-
uint16_t all : 1;
479-
uint16_t timeOfWeek : 1;
480-
uint16_t highResLatitude : 1;
481-
uint16_t highResLongitude : 1;
482-
uint16_t elipsoid : 1;
483-
uint16_t meanSeaLevel : 1;
484-
uint16_t geoidSeparation : 1;
485-
uint16_t horizontalAccuracy : 1;
486-
uint16_t verticalAccuracy : 1;
487-
} highResModuleQueried;
476+
struct
477+
{
478+
uint16_t all : 1;
479+
uint16_t timeOfWeek : 1;
480+
uint16_t highResLatitude : 1;
481+
uint16_t highResLongitude : 1;
482+
uint16_t elipsoid : 1;
483+
uint16_t meanSeaLevel : 1;
484+
uint16_t geoidSeparation : 1;
485+
uint16_t horizontalAccuracy : 1;
486+
uint16_t verticalAccuracy : 1;
487+
} highResModuleQueried;
488488

489489
uint16_t rtcmLen = 0;
490490
};

0 commit comments

Comments
 (0)