diff --git a/files/styles/style-dark.css b/files/styles/style-dark.css
index 136c7bc3283d3f97aa76c2eed2ac9f3943963f04..75656465c5a1150f2f7015afc9cc59f36ba44193 100644
--- a/files/styles/style-dark.css
+++ b/files/styles/style-dark.css
@@ -229,6 +229,11 @@ QGCPX4SensorCalibration QLabel#accelLabel {
min-height: 25px;
}
+QGCPX4VehicleConfig QLabel#rcLabel {
+ color: #FEC654;
+ font-size: 18pt;
+}
+
QGCToolWidgetItem {
border: 1px solid #666;
border-radius: 3px;
diff --git a/src/ui/QGCPX4VehicleConfig.cc b/src/ui/QGCPX4VehicleConfig.cc
index ceb17af298504b9db7eccdae72234e650ba10a67..9ab20d32417cf65a401198a4df7180855e0bccf7 100644
--- a/src/ui/QGCPX4VehicleConfig.cc
+++ b/src/ui/QGCPX4VehicleConfig.cc
@@ -239,6 +239,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView()));
updateTimer.start();
+ ui->rcLabel->setText(tr("NO RADIO CONTROL INPUT DETECTED. PLEASE ENSURE THE TRANSMITTER IS ON."));
+
}
QGCPX4VehicleConfig::~QGCPX4VehicleConfig()
@@ -423,6 +425,7 @@ void QGCPX4VehicleConfig::startCalibrationRC()
QMessageBox::warning(0,
tr("RC not Connected"),
tr("Is the RC receiver connected and transmitter turned on? Detected %1 radio channels. To operate PX4, you need at least 5 channels. ").arg(chanCount));
+ ui->rcCalibrationButton->setChecked(false);
return;
}
@@ -464,6 +467,9 @@ void QGCPX4VehicleConfig::startCalibrationRC()
void QGCPX4VehicleConfig::stopCalibrationRC()
{
+ if (!calibrationEnabled)
+ return;
+
QMessageBox::information(0,"Trims","Ensure all controls are centered and throttle is in the lowest position. Click OK to continue");
calibrationEnabled = false;
@@ -1808,5 +1814,8 @@ void QGCPX4VehicleConfig::updateView()
updateRcWidgetValues();
updateRcChanLabels();
+ if (chanCount > 0)
+ ui->rcLabel->setText(tr("Radio control detected with %1 channels.").arg(chanCount));
}
+
}
diff --git a/src/ui/QGCPX4VehicleConfig.ui b/src/ui/QGCPX4VehicleConfig.ui
index c9d9fb63b72a9e91245d105e28cce7a22a82218d..858e40936345cb653a8971ae1908fae5db766c8c 100644
--- a/src/ui/QGCPX4VehicleConfig.ui
+++ b/src/ui/QGCPX4VehicleConfig.ui
@@ -7,7 +7,7 @@
0
0
1256
- 918
+ 985
@@ -198,6 +198,13 @@
+ -
+
+
+ Waiting for RC channel data..
+
+
+
-
@@ -822,8 +829,8 @@
0
0
- 21
- 16
+ 98
+ 28
@@ -859,8 +866,8 @@
0
0
- 21
- 16
+ 98
+ 28
@@ -910,8 +917,8 @@
0
0
- 16
- 16
+ 98
+ 28