rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-1351 six point calibration would not clear instruction text when displaying home location not set error message

Browse Source
This commit is contained in:
Philippe Renon 2014-06-16 23:05:19 +02:00
parent bd127320d7
commit 0f439baff2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ground/openpilotgcs/src/plugins/config/calibration/sixpointcalibrationmodel.cpp
View File

@ -119,17 +119,20 @@ void SixPointCalibrationModel::start(bool calibrateAccel, bool calibrateMag)
calibratingAccel = calibrateAccel; calibratingAccel = calibrateAccel;
calibratingMag = calibrateMag; calibratingMag = calibrateMag;
// Store and reset board rotation before calibration starts started();
storeAndClearBoardRotation();
// check if Homelocation is set // check if Homelocation is set
HomeLocation::DataFields homeLocationData = homeLocation->getData(); HomeLocation::DataFields homeLocationData = homeLocation->getData();
if (!homeLocationData.Set) { if (!homeLocationData.Set) {
displayInstructions(tr("Home location not set, please set your home location and retry."), WizardModel::Warn); displayInstructions(tr("Home location not set, please set your home location and retry."), WizardModel::Warn);
displayInstructions(tr("Aborting calibration!"), WizardModel::Failure); displayInstructions(tr("Aborting calibration!"), WizardModel::Failure);
stopped();
return; return;
} }
// Store and reset board rotation before calibration starts
storeAndClearBoardRotation();
// Calibration accel // Calibration accel
AccelGyroSettings::DataFields accelGyroSettingsData = accelGyroSettings->getData(); AccelGyroSettings::DataFields accelGyroSettingsData = accelGyroSettings->getData();
memento.accelGyroSettingsData = accelGyroSettingsData; memento.accelGyroSettingsData = accelGyroSettingsData;
@ -202,8 +205,6 @@ void SixPointCalibrationModel::start(bool calibrateAccel, bool calibrateMag)
position = 0; position = 0;
started();
// Show instructions and enable controls // Show instructions and enable controls
progressChanged(0); progressChanged(0);
displayInstructions((*currentSteps)[0].instructions, WizardModel::Prompt); displayInstructions((*currentSteps)[0].instructions, WizardModel::Prompt);