Skip to content

Commit d02d403

Browse files
committed
Exit ublox check at boot if no response
1 parent c7d12b4 commit d02d403

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ uint32_t sdUsedSpaceMB = 0;
153153
//Connection settings to NTRIP Caster
154154
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
155155
#ifdef COMPILE_WIFI
156-
#include <WiFi.h>
157-
#include <HTTPClient.h> //Needed for ThingStream API for ZTP
156+
#include <WiFi.h> //Built-in.
157+
#include <HTTPClient.h> //Built-in. Needed for ThingStream API for ZTP
158158
#include <ArduinoJson.h> //http://librarymanager/All#Arduino_JSON_messagepack v6.19.4
159-
#include <WiFiClientSecure.h>
160-
#include <PubSubClient.h> //Used for MQTT obtaining of keys
159+
#include <WiFiClientSecure.h> //Built-in.
160+
#include <PubSubClient.h> //Built-in. Used for MQTT obtaining of keys
161161

162162
#include "esp_wifi.h" //Needed for init/deinit of resources to free up RAM
163163
#include "base64.h" //Built-in ESP32 library. Needed for NTRIP Client credential encoding.
@@ -212,7 +212,7 @@ SFE_UBLOX_GNSS_ADD i2cGNSS;
212212
uint8_t settingPayload[MAX_PAYLOAD_SIZE];
213213

214214
//These globals are updated regularly via the storePVTdata callback
215-
bool ubloxUpdated = false;
215+
bool pvtUpdated = false;
216216
double latitude;
217217
double longitude;
218218
float altitude;

Firmware/RTK_Surveyor/Rover.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void storePVTdata(UBX_NAV_PVT_data_t *ubxDataStruct)
340340
confirmedDate = ubxDataStruct->flags2.bits.confirmedDate;
341341
confirmedTime = ubxDataStruct->flags2.bits.confirmedTime;
342342

343-
ubloxUpdated = true;
343+
pvtUpdated = true;
344344
}
345345

346346
void storeHPdata(UBX_NAV_HPPOSLLH_data_t *ubxDataStruct)

Firmware/RTK_Surveyor/System.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,12 @@ bool configureUbloxModule()
180180
int maxWait = 2000;
181181

182182
//Wait for initial report from module
183-
while(ubloxUpdated == false)
183+
while(pvtUpdated == false)
184184
{
185185
i2cGNSS.checkUblox(); //Regularly poll to get latest data and any RTCM
186186
i2cGNSS.checkCallbacks(); //Process any callbacks: ie, eventTriggerReceived
187187
delay(10);
188+
if(millis() - startTime > maxWait) break;
188189
}
189190

190191
//The first thing we do is go to 1Hz to lighten any I2C traffic from a previous configuration

0 commit comments

Comments
 (0)