Skip to content

Remove trailing spaces #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Firmware/RTK_Surveyor/Base.ino
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

//Configure specific aspects of the receiver for base mode
bool configureUbloxModuleBase()
{
Expand Down
4 changes: 2 additions & 2 deletions Firmware/RTK_Surveyor/Display.ino
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ void paintBaseState()
systemState == STATE_ROVER_RTK_FIX ||
systemState == STATE_ROVER_CLIENT_WIFI_STARTED ||
systemState == STATE_ROVER_CLIENT_WIFI_CONNECTED ||
systemState == STATE_ROVER_CLIENT_STARTED
systemState == STATE_ROVER_CLIENT_STARTED
)
{
//Display icon associated with current Dynamic Model
Expand Down Expand Up @@ -1548,7 +1548,7 @@ void paintSystemTest()
//begin() attempts 3 connections
if (myGNSS.begin(serialGNSS) == true)
{

zedUartPassed = true;
oled.print(F("OK"));
}
Expand Down
2 changes: 1 addition & 1 deletion Firmware/RTK_Surveyor/RTK_Surveyor.ino
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ unsigned long lastRockerSwitchChange = 0; //If quick toggle is detected (less th
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#ifdef COMPILE_WIFI

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

AsyncWebServer server(80);
Expand Down
1 change: 0 additions & 1 deletion Firmware/RTK_Surveyor/Rover.ino
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

//Configure specific aspects of the receiver for rover mode
bool configureUbloxModuleRover()
{
Expand Down
4 changes: 2 additions & 2 deletions Firmware/RTK_Surveyor/SD.ino
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
/*
These are low level functions to aid in detecting whether a card is present or not.
Because of ESP32 v2 core, SdFat can only operate using Shared SPI. This makes the sd.begin test take over 1s
which causes the RTK product to boot slowly. To circumvent this, we will ping the SD card directly to see if it responds.
Failures take 2ms, successes take 1ms.

From Prototype puzzle: https://github.com/sparkfunX/ThePrototype/blob/master/Firmware/TestSketches/sdLocker/sdLocker.ino
License: Public domain. This code is based on Karl Lunt's work: https://www.seanet.com/~karllunt/sdlocker2.html
License: Public domain. This code is based on Karl Lunt's work: https://www.seanet.com/~karllunt/sdlocker2.html
*/

//Define commands for the SD card
Expand Down
2 changes: 1 addition & 1 deletion Firmware/RTK_Surveyor/States.ino
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ void updateSystemState()
else
{
log_d("Caster failed to connect. Trying again.");

if (ntripClientConnectionAttempts++ >= maxNtripClientConnectionAttempts)
{
Serial.println(F("Caster failed to connect. Do you have your caster address and port correct?"));
Expand Down
2 changes: 1 addition & 1 deletion Firmware/RTK_Surveyor/System.ino
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ void danceLEDs()
else
{
//Units can boot under 1s. Keep splash screen up for at least 2s.
while(millis() - splashStart < 2000) delay(1);
while(millis() - splashStart < 2000) delay(1);
}
}

Expand Down
12,626 changes: 6,313 additions & 6,313 deletions Firmware/RTK_Surveyor/form.h

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Firmware/RTK_Surveyor/menuMain.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
//Report status if ~ received, otherwise present config menu
void updateSerial()
{
if (Serial.available())
if (Serial.available())
{
byte incoming = Serial.read();

if(incoming == '~')
{
//Output custom GNTXT message with all current system data
printCurrentConditionsNMEA();
}
else
menuMain(); //Present user menu
}
}
}

//Display the options
Expand Down