Skip to content

Commit 0cf7cd3

Browse files
committed
Add menu config for initial positional accuracy before Survey-In
1 parent 95cc07b commit 0cf7cd3

File tree

1 file changed

+31
-14
lines changed

1 file changed

+31
-14
lines changed

Firmware/RTK_Surveyor/menuBase.ino

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,34 @@ void menuBase()
4949
Serial.print(F("3) Set required Mean 3D Standard Deviation: "));
5050
Serial.print(settings.observationPositionAccuracy, 3);
5151
Serial.println(F(" meters"));
52+
53+
Serial.print(F("4) Set required initial positional accuracy before Survey-In: "));
54+
Serial.print(settings.surveyInStartingAccuracy, 3);
55+
Serial.println(F(" meters"));
5256
}
5357

54-
Serial.print(F("4) Toggle NTRIP Server: "));
58+
Serial.print(F("5) Toggle NTRIP Server: "));
5559
if (settings.enableNtripServer == true) Serial.println(F("Enabled"));
5660
else Serial.println(F("Disabled"));
5761

5862
if (settings.enableNtripServer == true)
5963
{
60-
Serial.print(F("5) Set WiFi SSID: "));
64+
Serial.print(F("6) Set WiFi SSID: "));
6165
Serial.println(settings.ntripServer_wifiSSID);
6266

63-
Serial.print(F("6) Set WiFi PW: "));
67+
Serial.print(F("7) Set WiFi PW: "));
6468
Serial.println(settings.ntripServer_wifiPW);
6569

66-
Serial.print(F("7) Set Caster Address: "));
70+
Serial.print(F("8) Set Caster Address: "));
6771
Serial.println(settings.ntripServer_CasterHost);
6872

69-
Serial.print(F("8) Set Caster Port: "));
73+
Serial.print(F("9) Set Caster Port: "));
7074
Serial.println(settings.ntripServer_CasterPort);
7175

72-
Serial.print(F("9) Set Mountpoint: "));
76+
Serial.print(F("10) Set Mountpoint: "));
7377
Serial.println(settings.ntripServer_MountPoint);
7478

75-
Serial.print(F("10) Set Mountpoint PW: "));
79+
Serial.print(F("11) Set Mountpoint PW: "));
7680
Serial.println(settings.ntripServer_MountPointPW);
7781
}
7882

@@ -167,26 +171,39 @@ void menuBase()
167171
settings.observationPositionAccuracy = observationPositionAccuracy; //Recorded to NVM and file at main menu exit
168172
}
169173
}
170-
else if (incoming == 4)
174+
else if (settings.fixedBase == false && incoming == 4)
175+
{
176+
Serial.print(F("Enter the positional accuracy required before Survey-In begins (0.1 to 5.0m): "));
177+
float surveyInStartingAccuracy = getDouble(menuTimeout); //Timeout after x seconds
178+
if (surveyInStartingAccuracy < 0.1 || surveyInStartingAccuracy > 5.0) //Arbitrary 0.1m minimum
179+
{
180+
Serial.println(F("Error: Starting accuracy out of range"));
181+
}
182+
else
183+
{
184+
settings.surveyInStartingAccuracy = surveyInStartingAccuracy; //Recorded to NVM and file at main menu exit
185+
}
186+
}
187+
else if (incoming == 5)
171188
{
172189
settings.enableNtripServer ^= 1;
173190
}
174-
else if (incoming == 5 && settings.enableNtripServer == true)
191+
else if (incoming == 6 && settings.enableNtripServer == true)
175192
{
176193
Serial.print(F("Enter local WiFi SSID: "));
177194
readLine(settings.ntripServer_wifiSSID, sizeof(settings.ntripServer_wifiSSID), menuTimeoutExtended);
178195
}
179-
else if (incoming == 6 && settings.enableNtripServer == true)
196+
else if (incoming == 7 && settings.enableNtripServer == true)
180197
{
181198
Serial.printf("Enter password for WiFi network %s: ", settings.ntripServer_wifiSSID);
182199
readLine(settings.ntripServer_wifiPW, sizeof(settings.ntripServer_wifiPW), menuTimeoutExtended);
183200
}
184-
else if (incoming == 7 && settings.enableNtripServer == true)
201+
else if (incoming == 8 && settings.enableNtripServer == true)
185202
{
186203
Serial.print(F("Enter new Caster Address: "));
187204
readLine(settings.ntripServer_CasterHost, sizeof(settings.ntripServer_CasterHost), menuTimeoutExtended);
188205
}
189-
else if (incoming == 8 && settings.enableNtripServer == true)
206+
else if (incoming == 9 && settings.enableNtripServer == true)
190207
{
191208
Serial.print(F("Enter new Caster Port: "));
192209

@@ -196,12 +213,12 @@ void menuBase()
196213
else
197214
settings.ntripServer_CasterPort = ntripServer_CasterPort; //Recorded to NVM and file at main menu exit
198215
}
199-
else if (incoming == 9 && settings.enableNtripServer == true)
216+
else if (incoming == 10 && settings.enableNtripServer == true)
200217
{
201218
Serial.print(F("Enter new Mount Point: "));
202219
readLine(settings.ntripServer_MountPoint, sizeof(settings.ntripServer_MountPoint), menuTimeoutExtended);
203220
}
204-
else if (incoming == 10 && settings.enableNtripServer == true)
221+
else if (incoming == 11 && settings.enableNtripServer == true)
205222
{
206223
Serial.printf("Enter password for Mount Point %s: ", settings.ntripServer_MountPoint);
207224
readLine(settings.ntripServer_MountPointPW, sizeof(settings.ntripServer_MountPointPW), menuTimeoutExtended);

0 commit comments

Comments
 (0)