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

OP-1351 made instruction text more consistent accross calibration steps

Browse Source
This commit is contained in:
Philippe Renon 2014-06-01 17:22:26 +02:00
parent e434fc6db9
commit bfff7f73ed
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/config/calibration/gyrobiascalibrationmodel.cpp
View File

@ -153,7 +153,7 @@ void GyroBiasCalibrationModel::getSample(UAVObject *obj)
recallBoardRotation();
stopped();
displayInstructions(tr("Gyroscope calibration completed succesfully."), WizardModel::Success);
displayInstructions(tr("Gyroscope calibration completed successfully."), WizardModel::Success);
displayVisualHelp(CALIBRATION_HELPER_IMAGE_EMPTY);
}
}

2
ground/openpilotgcs/src/plugins/config/calibration/levelcalibrationmodel.cpp
View File

@ -144,7 +144,7 @@ void LevelCalibrationModel::getSample(UAVObject *obj)
stopped();
displayVisualHelp(CALIBRATION_HELPER_IMAGE_EMPTY);
displayInstructions(tr("Board leveling completed successfully."), WizardModel::Success);
displayInstructions(tr("Board level calibration completed successfully."), WizardModel::Success);
break;
}
}

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

@ -126,9 +126,8 @@ void SixPointCalibrationModel::start(bool calibrateAccel, bool calibrateMag)
// check if Homelocation is set
HomeLocation::DataFields homeLocationData = homeLocation->getData();
if (!homeLocationData.Set) {
// TODO
QMessageBox msgBox;
msgBox.setInformativeText(tr("<p>HomeLocation not SET.</p><p>Please set your HomeLocation and try again. Aborting calibration!</p>"));
msgBox.setInformativeText(tr("<p>Home location not set.</p><p>Please set your home location and retry. Aborting calibration!</p>"));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Information);
@ -464,14 +463,15 @@ void SixPointCalibrationModel::compute()
m_dirty = true;
if (calibratingMag) {
result.revoCalibrationData = revoCalibrationData;
displayInstructions(tr("Accelerometer calibration completed successfully."), WizardModel::Success);
}
if (calibratingAccel) {
result.accelGyroSettingsData = accelGyroSettingsData;
displayInstructions(tr("Magnetometer calibration completed successfully."), WizardModel::Success);
}
displayInstructions(tr("Sensor scale and bias computed successfully."), WizardModel::Success);
} else {
progressChanged(0);
displayInstructions(tr("Failed to calibrate! Please review the instructions and repeat."), WizardModel::Failure);
displayInstructions(tr("Calibration failed! Please review the help and retry."), WizardModel::Failure);
}
// set to run again
position = -1;

4
ground/openpilotgcs/src/plugins/config/calibration/thermal/compensationcalculationtransition.h
View File

@ -56,11 +56,11 @@ public:
if (m_helper->calibrationSuccessful()) {
m_helper->setProgressMax(100);
m_helper->setProgress(100);
m_helper->addInstructions(tr("Calibration completed successfully."), WizardModel::Success);
m_helper->addInstructions(tr("Thermal calibration completed successfully."), WizardModel::Success);
} else {
m_helper->setProgressMax(100);
m_helper->setProgress(0);
m_helper->addInstructions(tr("Calibration failed! Please read the instructions and retry."), WizardModel::Failure);
m_helper->addInstructions(tr("Calibration failed! Please review the help and retry."), WizardModel::Failure);
}
}