Skip to content

Commit 4f926fb

Browse files
committed
Remove and reduce hard delays.
1 parent 09c3792 commit 4f926fb

File tree

6 files changed

+18
-24
lines changed

6 files changed

+18
-24
lines changed

Firmware/RTK_Surveyor/Begin.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ void beginBoard()
9898

9999
setMuxport(settings.dataPortChannel); //Set mux to user's choice: NMEA, I2C, PPS, or DAC
100100

101-
delay(1000);
102-
103101
strcpy(platformFilePrefix, "SFE_Facet");
104102
strcpy(platformPrefix, "Facet");
105103
}

Firmware/RTK_Surveyor/Display.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void displaySplash()
121121
yPos = yPos + fontHeight + 2;
122122
printTextCenter("RTK", yPos, 1, 1, false);
123123

124-
yPos = yPos + fontHeight + 4;
124+
yPos = yPos + fontHeight + 5;
125125

126126
if (productVariant == RTK_SURVEYOR)
127127
{

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,9 @@ bool parseLine(char* str) {
312312
strcat(settingsFileName, "_Settings.txt");
313313
sd.remove(settingsFileName);
314314

315-
Serial.printf("RTK %s has been factory reset via settings file. Freezing. Please restart and open terminal at 115200bps.\n\r", platformPrefix);
316-
317-
while (1)
318-
delay(1); //Prevent CPU freakout
315+
Serial.printf("RTK %s has been factory reset via settings file. Unit restarting. Please open terminal at 115200bps.\n\r", platformPrefix);
316+
delay(2000);
317+
ESP.restart();
319318
}
320319

321320
//Check to see if this setting file is compatible with this version of RTK Surveyor

Firmware/RTK_Surveyor/States.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void updateSystemState()
274274
case WL_CONNECTION_LOST: Serial.println(F("WL_CONNECTION_LOST")); break;
275275
case WL_DISCONNECTED: Serial.println(F("WL_DISCONNECTED")); break;
276276
}
277-
delay(1000);
277+
delay(500);
278278
}
279279
#endif
280280
}
@@ -449,7 +449,7 @@ void updateSystemState()
449449
case WL_CONNECTION_LOST: Serial.println(F("WL_CONNECTION_LOST")); break;
450450
case WL_DISCONNECTED: Serial.println(F("WL_DISCONNECTED")); break;
451451
}
452-
delay(1000);
452+
delay(500);
453453
}
454454
#endif
455455
}

Firmware/RTK_Surveyor/menuBase.ino

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,16 @@ void menuSensorFusion()
225225
Serial.println();
226226
Serial.println(F("Menu: Sensor Fusion Menu"));
227227

228-
if (i2cGNSS.getEsfInfo()) // Poll new ESF STATUS data
229-
{
230-
Serial.print(F("Fusion Mode: "));
231-
Serial.print(i2cGNSS.packetUBXESFSTATUS->data.fusionMode);
232-
if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 0)
233-
Serial.println(F("Initializing"));
234-
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 1)
235-
Serial.println(F("Calibrated"));
236-
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 2)
237-
Serial.println(F("Suspended"));
238-
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 3)
239-
Serial.println(F("Disabled"));
240-
}
228+
Serial.print(F("Fusion Mode: "));
229+
Serial.print(i2cGNSS.packetUBXESFSTATUS->data.fusionMode);
230+
if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 0)
231+
Serial.println(F("Initializing"));
232+
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 1)
233+
Serial.println(F("Calibrated"));
234+
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 2)
235+
Serial.println(F("Suspended"));
236+
else if (i2cGNSS.packetUBXESFSTATUS->data.fusionMode == 3)
237+
Serial.println(F("Disabled"));
241238

242239
Serial.print(F("1) Toggle Automatic IMU-mount Alignment: "));
243240
if (settings.autoIMUmountAlignment == true) Serial.println(F("Enabled"));

Firmware/RTK_Surveyor/menuFirmware.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void updateFromSD(const char *firmwareFileName)
152152
if (firmwareFile.available() < bytesToWrite) bytesToWrite = firmwareFile.available(); //Trim this read size as needed
153153

154154
firmwareFile.read(dataArray, bytesToWrite); //Read the next set of bytes from file into our temp array
155-
delay(10); //Give RTOS time
155+
delay(1); //Give RTOS time
156156

157157
if (Update.write(dataArray, bytesToWrite) != bytesToWrite)
158158
{
@@ -161,7 +161,7 @@ void updateFromSD(const char *firmwareFileName)
161161
}
162162
else
163163
bytesWritten += bytesToWrite;
164-
delay(10); //Give RTOS time
164+
delay(1); //Give RTOS time
165165

166166
//Indicate progress
167167
if (bytesWritten > barWidth * portionSize)

0 commit comments

Comments
 (0)