Skip to content

Commit 6126b91

Browse files
authored
Merge pull request #117 from LeeLeahy2/trailing-spaces
Remove trailing spaces
2 parents 81089c1 + 4a6fc11 commit 6126b91

File tree

9 files changed

+6323
-6325
lines changed

9 files changed

+6323
-6325
lines changed

Firmware/RTK_Surveyor/Base.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
//Configure specific aspects of the receiver for base mode
32
bool configureUbloxModuleBase()
43
{

Firmware/RTK_Surveyor/Display.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ void paintBaseState()
358358
systemState == STATE_ROVER_RTK_FIX ||
359359
systemState == STATE_ROVER_CLIENT_WIFI_STARTED ||
360360
systemState == STATE_ROVER_CLIENT_WIFI_CONNECTED ||
361-
systemState == STATE_ROVER_CLIENT_STARTED
361+
systemState == STATE_ROVER_CLIENT_STARTED
362362
)
363363
{
364364
//Display icon associated with current Dynamic Model
@@ -1548,7 +1548,7 @@ void paintSystemTest()
15481548
//begin() attempts 3 connections
15491549
if (myGNSS.begin(serialGNSS) == true)
15501550
{
1551-
1551+
15521552
zedUartPassed = true;
15531553
oled.print(F("OK"));
15541554
}

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ unsigned long lastRockerSwitchChange = 0; //If quick toggle is detected (less th
328328
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
329329
#ifdef COMPILE_WIFI
330330

331-
#include "ESPAsyncWebServer.h" //Get from: https://github.com/me-no-dev/ESPAsyncWebServer
331+
#include "ESPAsyncWebServer.h" //Get from: https://github.com/me-no-dev/ESPAsyncWebServer
332332
#include "form.h"
333333

334334
AsyncWebServer server(80);

Firmware/RTK_Surveyor/Rover.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
//Configure specific aspects of the receiver for rover mode
32
bool configureUbloxModuleRover()
43
{

Firmware/RTK_Surveyor/SD.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/*
1+
/*
22
These are low level functions to aid in detecting whether a card is present or not.
33
Because of ESP32 v2 core, SdFat can only operate using Shared SPI. This makes the sd.begin test take over 1s
44
which causes the RTK product to boot slowly. To circumvent this, we will ping the SD card directly to see if it responds.
55
Failures take 2ms, successes take 1ms.
66
77
From Prototype puzzle: https://github.com/sparkfunX/ThePrototype/blob/master/Firmware/TestSketches/sdLocker/sdLocker.ino
8-
License: Public domain. This code is based on Karl Lunt's work: https://www.seanet.com/~karllunt/sdlocker2.html
8+
License: Public domain. This code is based on Karl Lunt's work: https://www.seanet.com/~karllunt/sdlocker2.html
99
*/
1010

1111
//Define commands for the SD card

Firmware/RTK_Surveyor/States.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void updateSystemState()
224224
else
225225
{
226226
log_d("Caster failed to connect. Trying again.");
227-
227+
228228
if (ntripClientConnectionAttempts++ >= maxNtripClientConnectionAttempts)
229229
{
230230
Serial.println(F("Caster failed to connect. Do you have your caster address and port correct?"));

Firmware/RTK_Surveyor/System.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ void danceLEDs()
485485
else
486486
{
487487
//Units can boot under 1s. Keep splash screen up for at least 2s.
488-
while(millis() - splashStart < 2000) delay(1);
488+
while(millis() - splashStart < 2000) delay(1);
489489
}
490490
}
491491

Firmware/RTK_Surveyor/form.h

Lines changed: 6313 additions & 6313 deletions
Large diffs are not rendered by default.

Firmware/RTK_Surveyor/menuMain.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
//Report status if ~ received, otherwise present config menu
33
void updateSerial()
44
{
5-
if (Serial.available())
5+
if (Serial.available())
66
{
77
byte incoming = Serial.read();
8-
8+
99
if(incoming == '~')
1010
{
1111
//Output custom GNTXT message with all current system data
1212
printCurrentConditionsNMEA();
1313
}
1414
else
1515
menuMain(); //Present user menu
16-
}
16+
}
1717
}
1818

1919
//Display the options

0 commit comments

Comments
 (0)