Browse Source

Bind support for DSMX with 8 or more channels

QGC4.4
Jean Cyr 12 years ago
parent
commit
e53b332e59
  1. 14
      src/ui/QGCPX4VehicleConfig.cc
  2. 9
      src/ui/QGCPX4VehicleConfig.ui

14
src/ui/QGCPX4VehicleConfig.cc

@ -335,7 +335,7 @@ void QGCPX4VehicleConfig::toggleCalibrationRC(bool enabled) @@ -335,7 +335,7 @@ void QGCPX4VehicleConfig::toggleCalibrationRC(bool enabled)
void QGCPX4VehicleConfig::toggleSpektrumPairing(bool enabled)
{
if (!ui->dsm2RadioButton->isChecked() && !ui->dsmxRadioButton) {
if (!ui->dsm2RadioButton->isChecked() && !ui->dsmxRadioButton && !ui->dsmx8RadioButton) {
// Reject
QMessageBox warnMsgBox;
warnMsgBox.setText(tr("Please select a Spektrum Protocol Version"));
@ -347,8 +347,16 @@ void QGCPX4VehicleConfig::toggleSpektrumPairing(bool enabled) @@ -347,8 +347,16 @@ void QGCPX4VehicleConfig::toggleSpektrumPairing(bool enabled)
}
UASInterface* mav = UASManager::instance()->getActiveUAS();
if (mav)
mav->pairRX(0, ui->dsmxRadioButton->isChecked() ? 1 : 0);
if (mav) {
int rxSubType;
if (ui->dsm2RadioButton->isChecked())
rxSubType = 0;
else if (ui->dsmxRadioButton->isChecked())
rxSubType = 1;
else // if (ui->dsmx8RadioButton->isChecked())
rxSubType = 2;
mav->pairRX(0, rxSubType);
}
}
void QGCPX4VehicleConfig::setTrimPositions()

9
src/ui/QGCPX4VehicleConfig.ui

@ -237,7 +237,14 @@ @@ -237,7 +237,14 @@
<item>
<widget class="QRadioButton" name="dsmxRadioButton">
<property name="text">
<string>DSMX Mode</string>
<string>DSMX Mode (3 to 7 channels)</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="dsmx8RadioButton">
<property name="text">
<string>DSMX Mode (8 or more channels)</string>
</property>
</widget>
</item>

Loading…
Cancel
Save