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

Updated setVal and added 'multi' setVal #28

Closed
wants to merge 3 commits into from
Closed

Updated setVal and added 'multi' setVal #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21379f4
Updated setVal and added 'multi' setVal
Jul 1, 2019
fa216ad
Merge branch 'master' into multiSetVal-(Issue-#20-#21-#23)
PaulZC Jul 1, 2019
728caeb
Revert "Merge branch 'master' into multiSetVal-(Issue-#20-#21-#23)"
Jul 1, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert "Merge branch 'master' into multiSetVal-(Issue-#20-#21-#23)" 
This reverts commit fa216ad, reversing changes made to 21379f4.
  • Loading branch information
Paul Clark committed Jul 1, 2019
commit 728caebe42859cc33c5583c74c9295f25c711144
18 changes: 0 additions & 18 deletions ISSUE_TEMPLATE.md
View file
Open in desktop

This file was deleted.

60 changes: 30 additions & 30 deletions src/SparkFun_Ublox_Arduino_Library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ class SFE_UBLOX_GPS

boolean setAutoPVT(boolean enabled, uint16_t maxWait = 250); //Enable/disable automatic PVT reports at the navigation frequency
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.
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.

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.
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.
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.
int32_t getAltitude(uint16_t maxWait = 250); //Returns the current altitude in mm above ellipsoid
Expand All @@ -258,14 +258,14 @@ class SFE_UBLOX_GPS
uint8_t getMinute(uint16_t maxWait = 250);
uint8_t getSecond(uint16_t maxWait = 250);

uint32_t getTimeOfWeek(uint16_t maxWait = 250);
int32_t getHighResLatitude(uint16_t maxWait = 250);
int32_t getHighResLongitude(uint16_t maxWait = 250);
int32_t getElipsoid(uint16_t maxWait = 250);
int32_t getMeanSeaLevel(uint16_t maxWait = 250);
int32_t getGeoidSeparation(uint16_t maxWait = 250);
uint32_t getHorizontalAccuracy(uint16_t maxWait = 250);
uint32_t getVerticalAccuracy(uint16_t maxWait = 250);
uint32_t getTimeOfWeek(uint16_t maxWait = 250);
int32_t getHighResLatitude(uint16_t maxWait = 250);
int32_t getHighResLongitude(uint16_t maxWait = 250);
int32_t getElipsoid(uint16_t maxWait = 250);
int32_t getMeanSeaLevel(uint16_t maxWait = 250);
int32_t getGeoidSeparation(uint16_t maxWait = 250);
uint32_t getHorizontalAccuracy(uint16_t maxWait = 250);
uint32_t getVerticalAccuracy(uint16_t maxWait = 250);

//Port configurations
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
Expand Down Expand Up @@ -376,14 +376,14 @@ class SFE_UBLOX_GPS
uint8_t versionLow; //Loaded from getProtocolVersion().
uint8_t versionHigh;

uint32_t timeOfWeek;
int32_t highResLatitude;
int32_t highResLongitude;
int32_t elipsoid;
int32_t meanSeaLevel;
int32_t geoidSeparation;
uint32_t horizontalAccuracy;
uint32_t verticalAccuracy;
uint32_t timeOfWeek;
int32_t highResLatitude;
int32_t highResLongitude;
int32_t elipsoid;
int32_t meanSeaLevel;
int32_t geoidSeparation;
uint32_t horizontalAccuracy;
uint32_t verticalAccuracy;

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

Expand Down Expand Up @@ -473,18 +473,18 @@ class SFE_UBLOX_GPS
uint16_t versionNumber : 1;
} moduleQueried;

struct
{
uint16_t all : 1;
uint16_t timeOfWeek : 1;
uint16_t highResLatitude : 1;
uint16_t highResLongitude : 1;
uint16_t elipsoid : 1;
uint16_t meanSeaLevel : 1;
uint16_t geoidSeparation : 1;
uint16_t horizontalAccuracy : 1;
uint16_t verticalAccuracy : 1;
} highResModuleQueried;
struct
{
uint16_t all : 1;
uint16_t timeOfWeek : 1;
uint16_t highResLatitude : 1;
uint16_t highResLongitude : 1;
uint16_t elipsoid : 1;
uint16_t meanSeaLevel : 1;
uint16_t geoidSeparation : 1;
uint16_t horizontalAccuracy : 1;
uint16_t verticalAccuracy : 1;
} highResModuleQueried;

uint16_t rtcmLen = 0;
};
Expand Down