Skip to content

Q
qgroundcontrol
Commit 091cc1eb authored by Don Gagne's avatar Don Gagne
Browse files
Options

Update to new QGCRadioChannelDisplay API

parent fc8c216a
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
src/ui/QGCVehicleConfig.cc
View file @ 091cc1eb
...@@ -206,14 +206,14 @@ void QGCVehicleConfig::startCalibrationRC() ...@@ -206,14 +206,14 @@ void QGCVehicleConfig::startCalibrationRC()
ui->rcCalibrationButton->setText(tr("Stop RC Calibration")); ui->rcCalibrationButton->setText(tr("Stop RC Calibration"));
resetCalibrationRC(); resetCalibrationRC();
calibrationEnabled = true; calibrationEnabled = true;
ui->rollWidget->showMinMax(); ui->rollWidget->showMinMax(true);
ui->pitchWidget->showMinMax(); ui->pitchWidget->showMinMax(true);
ui->yawWidget->showMinMax(); ui->yawWidget->showMinMax(true);
ui->throttleWidget->showMinMax(); ui->throttleWidget->showMinMax(true);
ui->radio5Widget->showMinMax(); ui->radio5Widget->showMinMax(true);
ui->radio6Widget->showMinMax(); ui->radio6Widget->showMinMax(true);
ui->radio7Widget->showMinMax(); ui->radio7Widget->showMinMax(true);
ui->radio8Widget->showMinMax(); ui->radio8Widget->showMinMax(true);
} }
void QGCVehicleConfig::stopCalibrationRC() void QGCVehicleConfig::stopCalibrationRC()
...@@ -222,14 +222,14 @@ void QGCVehicleConfig::stopCalibrationRC() ...@@ -222,14 +222,14 @@ void QGCVehicleConfig::stopCalibrationRC()
calibrationEnabled = false; calibrationEnabled = false;
ui->rcTypeComboBox->setEnabled(true); ui->rcTypeComboBox->setEnabled(true);
ui->rcCalibrationButton->setText(tr("Start RC Calibration")); ui->rcCalibrationButton->setText(tr("Start RC Calibration"));
ui->rollWidget->hideMinMax(); ui->rollWidget->showMinMax(false);
ui->pitchWidget->hideMinMax(); ui->pitchWidget->showMinMax(false);
ui->yawWidget->hideMinMax(); ui->yawWidget->showMinMax(false);
ui->throttleWidget->hideMinMax(); ui->throttleWidget->showMinMax(false);
ui->radio5Widget->hideMinMax(); ui->radio5Widget->showMinMax(false);
ui->radio6Widget->hideMinMax(); ui->radio6Widget->showMinMax(false);
ui->radio7Widget->hideMinMax(); ui->radio7Widget->showMinMax(false);
ui->radio8Widget->hideMinMax(); ui->radio8Widget->showMinMax(false);
QString statusstr; QString statusstr;
statusstr = "Below you will find the detected radio calibration information that will be sent to the autopilot\n"; statusstr = "Below you will find the detected radio calibration information that will be sent to the autopilot\n";
statusstr += "Normal values are around 1100 to 1900, with disconnected channels reading very close to 1500\n\n"; statusstr += "Normal values are around 1100 to 1900, with disconnected channels reading very close to 1500\n\n";
......
src/ui/configuration/RadioCalibrationConfig.cc
View file @ 091cc1eb
...@@ -176,14 +176,14 @@ void RadioCalibrationConfig::calibrateButtonClicked() ...@@ -176,14 +176,14 @@ void RadioCalibrationConfig::calibrateButtonClicked()
rcMin[i] = 1500; rcMin[i] = 1500;
rcMax[i] = 1500; rcMax[i] = 1500;
} }
ui.rollWidget->showMinMax(); ui.rollWidget->showMinMax(true);
ui.pitchWidget->showMinMax(); ui.pitchWidget->showMinMax(true);
ui.yawWidget->showMinMax(); ui.yawWidget->showMinMax(true);
ui.radio5Widget->showMinMax(); ui.radio5Widget->showMinMax(true);
ui.radio6Widget->showMinMax(); ui.radio6Widget->showMinMax(true);
ui.radio7Widget->showMinMax(); ui.radio7Widget->showMinMax(true);
ui.throttleWidget->showMinMax(); ui.throttleWidget->showMinMax(true);
ui.radio8Widget->showMinMax(); ui.radio8Widget->showMinMax(true);
QMessageBox::information(0,"Information","Click OK, then move all sticks to their extreme positions, watching the min/max values to ensure you get the most range from your controller. This includes all switches"); QMessageBox::information(0,"Information","Click OK, then move all sticks to their extreme positions, watching the min/max values to ensure you get the most range from your controller. This includes all switches");
} }
else else
...@@ -192,14 +192,14 @@ void RadioCalibrationConfig::calibrateButtonClicked() ...@@ -192,14 +192,14 @@ void RadioCalibrationConfig::calibrateButtonClicked()
QMessageBox::information(0,"Trims","Ensure all sticks are centered and throttle is in the downmost position, click OK to continue"); QMessageBox::information(0,"Trims","Ensure all sticks are centered and throttle is in the downmost position, click OK to continue");
///TODO: Set trims! ///TODO: Set trims!
m_calibrationEnabled = false; m_calibrationEnabled = false;
ui.rollWidget->hideMinMax(); ui.rollWidget->showMinMax(false);
ui.pitchWidget->hideMinMax(); ui.pitchWidget->showMinMax(false);
ui.yawWidget->hideMinMax(); ui.yawWidget->showMinMax(false);
ui.radio5Widget->hideMinMax(); ui.radio5Widget->showMinMax(false);
ui.radio6Widget->hideMinMax(); ui.radio6Widget->showMinMax(false);
ui.throttleWidget->hideMinMax(); ui.throttleWidget->showMinMax(false);
ui.radio7Widget->hideMinMax(); ui.radio7Widget->showMinMax(false);
ui.radio8Widget->hideMinMax(); ui.radio8Widget->showMinMax(false);
QString statusstr; QString statusstr;
statusstr = "Below you will find the detected radio calibration information that will be sent to the autopilot\n"; statusstr = "Below you will find the detected radio calibration information that will be sent to the autopilot\n";
statusstr += "Normal values are around 1100 to 1900, with disconnected channels reading very close to 1500\n\n"; statusstr += "Normal values are around 1100 to 1900, with disconnected channels reading very close to 1500\n\n";
......
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