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

Commit e041f77

Browse files
author
Nathan Seidle
committed
Fix issue #27 
1 parent f5035de commit e041f77

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎src/SparkFun_Ublox_Arduino_Library.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,7 +1900,7 @@ uint8_t SFE_UBLOX_GPS::extractByte(uint8_t spotToStart)
19001900
uint16_t SFE_UBLOX_GPS::getYear(uint16_t maxWait)
19011901
{
19021902
if (moduleQueried.gpsYear == false)
1903-
getPVT();
1903+
getPVT(maxWait);
19041904
moduleQueried.gpsYear = false; //Since we are about to give this to user, mark this data as stale
19051905
return (gpsYear);
19061906
}
@@ -1909,7 +1909,7 @@ uint16_t SFE_UBLOX_GPS::getYear(uint16_t maxWait)
19091909
uint8_t SFE_UBLOX_GPS::getMonth(uint16_t maxWait)
19101910
{
19111911
if (moduleQueried.gpsMonth == false)
1912-
getPVT();
1912+
getPVT(maxWait);
19131913
moduleQueried.gpsMonth = false; //Since we are about to give this to user, mark this data as stale
19141914
return (gpsMonth);
19151915
}
@@ -1918,7 +1918,7 @@ uint8_t SFE_UBLOX_GPS::getMonth(uint16_t maxWait)
19181918
uint8_t SFE_UBLOX_GPS::getDay(uint16_t maxWait)
19191919
{
19201920
if (moduleQueried.gpsDay == false)
1921-
getPVT();
1921+
getPVT(maxWait);
19221922
moduleQueried.gpsDay = false; //Since we are about to give this to user, mark this data as stale
19231923
return (gpsDay);
19241924
}
@@ -1927,7 +1927,7 @@ uint8_t SFE_UBLOX_GPS::getDay(uint16_t maxWait)
19271927
uint8_t SFE_UBLOX_GPS::getHour(uint16_t maxWait)
19281928
{
19291929
if (moduleQueried.gpsHour == false)
1930-
getPVT();
1930+
getPVT(maxWait);
19311931
moduleQueried.gpsHour = false; //Since we are about to give this to user, mark this data as stale
19321932
return (gpsHour);
19331933
}
@@ -1936,7 +1936,7 @@ uint8_t SFE_UBLOX_GPS::getHour(uint16_t maxWait)
19361936
uint8_t SFE_UBLOX_GPS::getMinute(uint16_t maxWait)
19371937
{
19381938
if (moduleQueried.gpsMinute == false)
1939-
getPVT();
1939+
getPVT(maxWait);
19401940
moduleQueried.gpsMinute = false; //Since we are about to give this to user, mark this data as stale
19411941
return (gpsMinute);
19421942
}
@@ -1945,7 +1945,7 @@ uint8_t SFE_UBLOX_GPS::getMinute(uint16_t maxWait)
19451945
uint8_t SFE_UBLOX_GPS::getSecond(uint16_t maxWait)
19461946
{
19471947
if (moduleQueried.gpsSecond == false)
1948-
getPVT();
1948+
getPVT(maxWait);
19491949
moduleQueried.gpsSecond = false; //Since we are about to give this to user, mark this data as stale
19501950
return (gpsSecond);
19511951
}
@@ -1954,7 +1954,7 @@ uint8_t SFE_UBLOX_GPS::getSecond(uint16_t maxWait)
19541954
uint16_t SFE_UBLOX_GPS::getMillisecond(uint16_t maxWait)
19551955
{
19561956
if (moduleQueried.gpsiTOW == false)
1957-
getPVT();
1957+
getPVT(maxWait);
19581958
moduleQueried.gpsiTOW = false; //Since we are about to give this to user, mark this data as stale
19591959
return (gpsMillisecond);
19601960
}
@@ -1963,7 +1963,7 @@ uint16_t SFE_UBLOX_GPS::getMillisecond(uint16_t maxWait)
19631963
int32_t SFE_UBLOX_GPS::getNanosecond(uint16_t maxWait)
19641964
{
19651965
if (moduleQueried.gpsNanosecond == false)
1966-
getPVT();
1966+
getPVT(maxWait);
19671967
moduleQueried.gpsNanosecond = false; //Since we are about to give this to user, mark this data as stale
19681968
return (gpsNanosecond);
19691969
}
@@ -1999,63 +1999,63 @@ boolean SFE_UBLOX_GPS::getPVT(uint16_t maxWait)
19991999
uint32_t SFE_UBLOX_GPS::getTimeOfWeek(uint16_t maxWait /* = 250*/)
20002000
{
20012001
if (moduleQueried.gpsiTOW == false)
2002-
getPVT();
2002+
getPVT(maxWait);
20032003
moduleQueried.gpsiTOW = false; //Since we are about to give this to user, mark this data as stale
20042004
return (timeOfWeek);
20052005
}
20062006

20072007
int32_t SFE_UBLOX_GPS::getHighResLatitude(uint16_t maxWait /* = 250*/)
20082008
{
20092009
if (highResModuleQueried.highResLatitude == false)
2010-
getHPPOSLLH();
2010+
getHPPOSLLH(maxWait);
20112011
highResModuleQueried.highResLatitude = false; //Since we are about to give this to user, mark this data as stale
20122012
return (highResLatitude);
20132013
}
20142014

20152015
int32_t SFE_UBLOX_GPS::getHighResLongitude(uint16_t maxWait /* = 250*/)
20162016
{
20172017
if (highResModuleQueried.highResLongitude == false)
2018-
getHPPOSLLH();
2018+
getHPPOSLLH(maxWait);
20192019
highResModuleQueried.highResLongitude = false; //Since we are about to give this to user, mark this data as stale
20202020
return (highResLongitude);
20212021
}
20222022

20232023
int32_t SFE_UBLOX_GPS::getElipsoid(uint16_t maxWait /* = 250*/)
20242024
{
20252025
if (highResModuleQueried.elipsoid == false)
2026-
getHPPOSLLH();
2026+
getHPPOSLLH(maxWait);
20272027
highResModuleQueried.elipsoid = false; //Since we are about to give this to user, mark this data as stale
20282028
return (elipsoid);
20292029
}
20302030

20312031
int32_t SFE_UBLOX_GPS::getMeanSeaLevel(uint16_t maxWait /* = 250*/)
20322032
{
20332033
if (highResModuleQueried.meanSeaLevel == false)
2034-
getHPPOSLLH();
2034+
getHPPOSLLH(maxWait);
20352035
highResModuleQueried.meanSeaLevel = false; //Since we are about to give this to user, mark this data as stale
20362036
return (meanSeaLevel);
20372037
}
20382038

20392039
int32_t SFE_UBLOX_GPS::getGeoidSeparation(uint16_t maxWait /* = 250*/)
20402040
{
20412041
if (highResModuleQueried.geoidSeparation == false)
2042-
getHPPOSLLH();
2042+
getHPPOSLLH(maxWait);
20432043
highResModuleQueried.geoidSeparation = false; //Since we are about to give this to user, mark this data as stale
20442044
return (geoidSeparation);
20452045
}
20462046

20472047
uint32_t SFE_UBLOX_GPS::getHorizontalAccuracy(uint16_t maxWait /* = 250*/)
20482048
{
20492049
if (highResModuleQueried.horizontalAccuracy == false)
2050-
getHPPOSLLH();
2050+
getHPPOSLLH(maxWait);
20512051
highResModuleQueried.horizontalAccuracy = false; //Since we are about to give this to user, mark this data as stale
20522052
return (horizontalAccuracy);
20532053
}
20542054

20552055
uint32_t SFE_UBLOX_GPS::getVerticalAccuracy(uint16_t maxWait /* = 250*/)
20562056
{
20572057
if (highResModuleQueried.verticalAccuracy == false)
2058-
getHPPOSLLH();
2058+
getHPPOSLLH(maxWait);
20592059
highResModuleQueried.verticalAccuracy = false; //Since we are about to give this to user, mark this data as stale
20602060
return (verticalAccuracy);
20612061
}
@@ -2097,7 +2097,7 @@ uint32_t SFE_UBLOX_GPS::getPositionAccuracy(uint16_t maxWait)
20972097
int32_t SFE_UBLOX_GPS::getLatitude(uint16_t maxWait)
20982098
{
20992099
if (moduleQueried.latitude == false)
2100-
getPVT();
2100+
getPVT(maxWait);
21012101
moduleQueried.latitude = false; //Since we are about to give this to user, mark this data as stale
21022102

21032103
return (latitude);
@@ -2108,7 +2108,7 @@ int32_t SFE_UBLOX_GPS::getLatitude(uint16_t maxWait)
21082108
int32_t SFE_UBLOX_GPS::getLongitude(uint16_t maxWait)
21092109
{
21102110
if (moduleQueried.longitude == false)
2111-
getPVT();
2111+
getPVT(maxWait);
21122112
moduleQueried.longitude = false; //Since we are about to give this to user, mark this data as stale
21132113
moduleQueried.all = false;
21142114

@@ -2119,7 +2119,7 @@ int32_t SFE_UBLOX_GPS::getLongitude(uint16_t maxWait)
21192119
int32_t SFE_UBLOX_GPS::getAltitude(uint16_t maxWait)
21202120
{
21212121
if (moduleQueried.altitude == false)
2122-
getPVT();
2122+
getPVT(maxWait);
21232123
moduleQueried.altitude = false; //Since we are about to give this to user, mark this data as stale
21242124
moduleQueried.all = false;
21252125

@@ -2132,7 +2132,7 @@ int32_t SFE_UBLOX_GPS::getAltitude(uint16_t maxWait)
21322132
int32_t SFE_UBLOX_GPS::getAltitudeMSL(uint16_t maxWait)
21332133
{
21342134
if (moduleQueried.altitudeMSL == false)
2135-
getPVT();
2135+
getPVT(maxWait);
21362136
moduleQueried.altitudeMSL = false; //Since we are about to give this to user, mark this data as stale
21372137
moduleQueried.all = false;
21382138

@@ -2143,7 +2143,7 @@ int32_t SFE_UBLOX_GPS::getAltitudeMSL(uint16_t maxWait)
21432143
uint8_t SFE_UBLOX_GPS::getSIV(uint16_t maxWait)
21442144
{
21452145
if (moduleQueried.SIV == false)
2146-
getPVT();
2146+
getPVT(maxWait);
21472147
moduleQueried.SIV = false; //Since we are about to give this to user, mark this data as stale
21482148
moduleQueried.all = false;
21492149

@@ -2155,7 +2155,7 @@ uint8_t SFE_UBLOX_GPS::getSIV(uint16_t maxWait)
21552155
uint8_t SFE_UBLOX_GPS::getFixType(uint16_t maxWait)
21562156
{
21572157
if (moduleQueried.fixType == false)
2158-
getPVT();
2158+
getPVT(maxWait);
21592159
moduleQueried.fixType = false; //Since we are about to give this to user, mark this data as stale
21602160
moduleQueried.all = false;
21612161

@@ -2168,7 +2168,7 @@ uint8_t SFE_UBLOX_GPS::getFixType(uint16_t maxWait)
21682168
uint8_t SFE_UBLOX_GPS::getCarrierSolutionType(uint16_t maxWait)
21692169
{
21702170
if (moduleQueried.carrierSolution == false)
2171-
getPVT();
2171+
getPVT(maxWait);
21722172
moduleQueried.carrierSolution = false; //Since we are about to give this to user, mark this data as stale
21732173
moduleQueried.all = false;
21742174

@@ -2179,7 +2179,7 @@ uint8_t SFE_UBLOX_GPS::getCarrierSolutionType(uint16_t maxWait)
21792179
int32_t SFE_UBLOX_GPS::getGroundSpeed(uint16_t maxWait)
21802180
{
21812181
if (moduleQueried.groundSpeed == false)
2182-
getPVT();
2182+
getPVT(maxWait);
21832183
moduleQueried.groundSpeed = false; //Since we are about to give this to user, mark this data as stale
21842184
moduleQueried.all = false;
21852185

@@ -2190,7 +2190,7 @@ int32_t SFE_UBLOX_GPS::getGroundSpeed(uint16_t maxWait)
21902190
int32_t SFE_UBLOX_GPS::getHeading(uint16_t maxWait)
21912191
{
21922192
if (moduleQueried.headingOfMotion == false)
2193-
getPVT();
2193+
getPVT(maxWait);
21942194
moduleQueried.headingOfMotion = false; //Since we are about to give this to user, mark this data as stale
21952195
moduleQueried.all = false;
21962196

@@ -2201,7 +2201,7 @@ int32_t SFE_UBLOX_GPS::getHeading(uint16_t maxWait)
22012201
uint16_t SFE_UBLOX_GPS::getPDOP(uint16_t maxWait)
22022202
{
22032203
if (moduleQueried.pDOP == false)
2204-
getPVT();
2204+
getPVT(maxWait);
22052205
moduleQueried.pDOP = false; //Since we are about to give this to user, mark this data as stale
22062206
moduleQueried.all = false;
22072207

0 commit comments

Comments
 (0)