Skip to content

Q
qgroundcontrol
Commit 08959fb3 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Updated sensor calibration filenames

parent 4d2b2d6d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/ui/px4_configuration/QGCPX4SensorCalibration.cc
View file @ 08959fb3
...@@ -30,9 +30,9 @@ QGCPX4SensorCalibration::QGCPX4SensorCalibration(QWidget *parent) : ...@@ -30,9 +30,9 @@ QGCPX4SensorCalibration::QGCPX4SensorCalibration(QWidget *parent) :
ui->autopilotComboBox->setEnabled(false); ui->autopilotComboBox->setEnabled(false);
ui->magComboBox->setEnabled(false); ui->magComboBox->setEnabled(false);
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
setAutopilotImage(":/files/images/px4/calibration/accel_z-.png"); setAutopilotImage(":/files/images/px4/calibration/accel_down.png");
setGpsImage(":/files/images/px4/calibration/accel_z-.png"); setGpsImage(":/files/images/px4/calibration/accel_down.png");
// Fill combo boxes // Fill combo boxes
ui->autopilotComboBox->addItem(tr("Default Orientation"), 0); ui->autopilotComboBox->addItem(tr("Default Orientation"), 0);
...@@ -402,7 +402,7 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever ...@@ -402,7 +402,7 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever
if (text.endsWith(" calibration: done") || text.endsWith(" calibration: failed")) { if (text.endsWith(" calibration: done") || text.endsWith(" calibration: failed")) {
// XXX use a confirmation image or something // XXX use a confirmation image or something
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
if (text.endsWith(" calibration: done")) { if (text.endsWith(" calibration: done")) {
ui->progressBar->setValue(100); ui->progressBar->setValue(100);
} else { } else {
...@@ -446,7 +446,7 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever ...@@ -446,7 +446,7 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever
} }
if (text.endsWith(" calibration: started")) { if (text.endsWith(" calibration: started")) {
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
} }
// XXX color messages according to severity // XXX color messages according to severity
...@@ -466,28 +466,28 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever ...@@ -466,28 +466,28 @@ void QGCPX4SensorCalibration::handleTextMessage(int uasid, int compId, int sever
void QGCPX4SensorCalibration::gyroButtonClicked() void QGCPX4SensorCalibration::gyroButtonClicked()
{ {
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0); activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0);
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
} }
void QGCPX4SensorCalibration::magButtonClicked() void QGCPX4SensorCalibration::magButtonClicked()
{ {
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0); activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0);
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
} }
void QGCPX4SensorCalibration::accelButtonClicked() void QGCPX4SensorCalibration::accelButtonClicked()
{ {
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0); activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0);
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
} }
void QGCPX4SensorCalibration::diffPressureButtonClicked() void QGCPX4SensorCalibration::diffPressureButtonClicked()
{ {
setInstructionImage(":/files/images/px4/calibration/accel_z-.png"); setInstructionImage(":/files/images/px4/calibration/accel_down.png");
activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0); activeUAS->executeCommand(MAV_CMD_PREFLIGHT_CALIBRATION, 1, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0);
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment