Skip to content

Base: Increase maximum accuracy from 5 to 10 meters #719

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.

Sign up for GitHub

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
Oct 24, 2023
Merged

Base: Increase maximum accuracy from 5 to 10 meters #719

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions Firmware/RTK_Surveyor/menuBase.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*------------------------------------------------------------------------------
menuBase.ino
------------------------------------------------------------------------------*/

//----------------------------------------
// Constants
//----------------------------------------

static const float maxObservationPositionAccuracy = 10.0;
static const float maxSurveyInStartingAccuracy = 10.0;

//----------------------------------------
// Menus
//----------------------------------------

// Configure the survey in settings (time and 3D dev max)
// Set the ECEF coordinates for a known location
void menuBase()
Expand Down Expand Up @@ -249,13 +264,9 @@ void menuBase()
}
else if (settings.fixedBase == false && incoming == 3)
{
systemPrint("Enter the number of meters for survey-in required position accuracy (1.0 to 5.0m): ");
systemPrintf("Enter the number of meters for survey-in required position accuracy (1.0 to %.1fm): ", maxObservationPositionAccuracy);
float observationPositionAccuracy = getDouble();

float maxObservationPositionAccuracy = 5.0;
if (ENABLE_DEVELOPER)
maxObservationPositionAccuracy = 10.0;

if (observationPositionAccuracy < 1.0 ||
observationPositionAccuracy > maxObservationPositionAccuracy) // Arbitrary 1m minimum
systemPrintln("Error: Observation positional accuracy requirement out of range");
Expand All @@ -265,9 +276,10 @@ void menuBase()
}
else if (settings.fixedBase == false && incoming == 4)
{
systemPrint("Enter the positional accuracy required before Survey-In begins (0.1 to 5.0m): ");
systemPrintf("Enter the positional accuracy required before Survey-In begins (0.1 to %.1fm): ", maxSurveyInStartingAccuracy);
float surveyInStartingAccuracy = getDouble();
if (surveyInStartingAccuracy < 0.1 || surveyInStartingAccuracy > 5.0) // Arbitrary 0.1m minimum
if (surveyInStartingAccuracy < 0.1 ||
surveyInStartingAccuracy > maxSurveyInStartingAccuracy) // Arbitrary 0.1m minimum
systemPrintln("Error: Starting accuracy out of range");
else
settings.surveyInStartingAccuracy =
Expand Down Expand Up @@ -577,6 +589,10 @@ void menuSensorFusion()
clearBuffer(); // Empty buffer of any newline chars
}

//----------------------------------------
// Support functions
//----------------------------------------

// Enable or disable sensor fusion using keys
void setSensorFusion(bool enable)
{
Expand Down