Skip to content

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

Merge pull request #655 from mavlink/rc_cal_cleanup 

RC switches names fixed in RC calibration
parents 8371276c 06b8ce6d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 130 deletions
src/comm/px4_custom_mode.h
View file @ e1267cf4
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
enum PX4_CUSTOM_MAIN_MODE { enum PX4_CUSTOM_MAIN_MODE {
PX4_CUSTOM_MAIN_MODE_MANUAL = 1, PX4_CUSTOM_MAIN_MODE_MANUAL = 1,
PX4_CUSTOM_MAIN_MODE_SEATBELT, PX4_CUSTOM_MAIN_MODE_ALTCTL,
PX4_CUSTOM_MAIN_MODE_EASY, PX4_CUSTOM_MAIN_MODE_POSCTL,
PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_MAIN_MODE_AUTO,
}; };
......
src/uas/UAS.cc
View file @ e1267cf4
...@@ -3394,10 +3394,10 @@ QString UAS::getShortModeTextFor(uint8_t base_mode, uint32_t custom_mode, int au ...@@ -3394,10 +3394,10 @@ QString UAS::getShortModeTextFor(uint8_t base_mode, uint32_t custom_mode, int au
px4_mode.data = custom_mode; px4_mode.data = custom_mode;
if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_MANUAL) { if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_MANUAL) {
mode += "|MANUAL"; mode += "|MANUAL";
} else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_SEATBELT) { } else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_ALTCTL) {
mode += "|SEATBELT"; mode += "|ALTCTL";
} else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_EASY) { } else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_POSCTL) {
mode += "|EASY"; mode += "|POSCTL";
} else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_AUTO) { } else if (px4_mode.main_mode == PX4_CUSTOM_MAIN_MODE_AUTO) {
mode += "|AUTO"; mode += "|AUTO";
if (px4_mode.sub_mode == PX4_CUSTOM_SUB_MODE_AUTO_READY) { if (px4_mode.sub_mode == PX4_CUSTOM_SUB_MODE_AUTO_READY) {
......
src/ui/QGCPX4VehicleConfig.cc
View file @ e1267cf4
...@@ -71,7 +71,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -71,7 +71,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
channelNames << "Yaw / Rudder"; channelNames << "Yaw / Rudder";
channelNames << "Throttle"; channelNames << "Throttle";
channelNames << "Main Mode Switch"; channelNames << "Main Mode Switch";
channelNames << "Assist Switch"; channelNames << "Posctl Switch";
channelNames << "Loiter Switch"; channelNames << "Loiter Switch";
channelNames << "Return Switch"; channelNames << "Return Switch";
channelNames << "Flaps"; channelNames << "Flaps";
...@@ -202,8 +202,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -202,8 +202,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
connect(ui->yawSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setYawChan(int))); connect(ui->yawSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setYawChan(int)));
connect(ui->throttleSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setThrottleChan(int))); connect(ui->throttleSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setThrottleChan(int)));
connect(ui->modeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setModeChan(int))); connect(ui->modeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setModeChan(int)));
connect(ui->assistSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setAssistChan(int))); connect(ui->posctlSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setAssistChan(int)));
connect(ui->missionSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setMissionChan(int))); connect(ui->loiterSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setMissionChan(int)));
connect(ui->returnSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setReturnChan(int))); connect(ui->returnSwSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setReturnChan(int)));
connect(ui->flapsSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setFlapsChan(int))); connect(ui->flapsSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setFlapsChan(int)));
connect(ui->aux1SpinBox, SIGNAL(valueChanged(int)), this, SLOT(setAux1Chan(int))); connect(ui->aux1SpinBox, SIGNAL(valueChanged(int)), this, SLOT(setAux1Chan(int)));
...@@ -215,8 +215,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -215,8 +215,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
connect(ui->invertCheckBox_3, SIGNAL(clicked(bool)), this, SLOT(setYawInverted(bool))); connect(ui->invertCheckBox_3, SIGNAL(clicked(bool)), this, SLOT(setYawInverted(bool)));
connect(ui->invertCheckBox_4, SIGNAL(clicked(bool)), this, SLOT(setThrottleInverted(bool))); connect(ui->invertCheckBox_4, SIGNAL(clicked(bool)), this, SLOT(setThrottleInverted(bool)));
connect(ui->invertCheckBox_5, SIGNAL(clicked(bool)), this, SLOT(setModeInverted(bool))); connect(ui->invertCheckBox_5, SIGNAL(clicked(bool)), this, SLOT(setModeInverted(bool)));
connect(ui->assistSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setAssistInverted(bool))); connect(ui->posctlSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setAssistInverted(bool)));
connect(ui->missionSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setMissionInverted(bool))); connect(ui->loiterSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setMissionInverted(bool)));
connect(ui->returnSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setReturnInverted(bool))); connect(ui->returnSwInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setReturnInverted(bool)));
connect(ui->flapsInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setFlapsInverted(bool))); connect(ui->flapsInvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setFlapsInverted(bool)));
connect(ui->aux1InvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setAux1Inverted(bool))); connect(ui->aux1InvertCheckBox, SIGNAL(clicked(bool)), this, SLOT(setAux1Inverted(bool)));
...@@ -227,8 +227,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -227,8 +227,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
connect(ui->yawButton, SIGNAL(clicked()), this, SLOT(identifyYawChannel())); connect(ui->yawButton, SIGNAL(clicked()), this, SLOT(identifyYawChannel()));
connect(ui->throttleButton, SIGNAL(clicked()), this, SLOT(identifyThrottleChannel())); connect(ui->throttleButton, SIGNAL(clicked()), this, SLOT(identifyThrottleChannel()));
connect(ui->modeButton, SIGNAL(clicked()), this, SLOT(identifyModeChannel())); connect(ui->modeButton, SIGNAL(clicked()), this, SLOT(identifyModeChannel()));
connect(ui->assistSwButton, SIGNAL(clicked()), this, SLOT(identifyAssistChannel())); connect(ui->posctlSwButton, SIGNAL(clicked()), this, SLOT(identifyAssistChannel()));
connect(ui->missionSwButton, SIGNAL(clicked()), this, SLOT(identifyMissionChannel())); connect(ui->loiterSwButton, SIGNAL(clicked()), this, SLOT(identifyMissionChannel()));
connect(ui->returnSwButton, SIGNAL(clicked()), this, SLOT(identifyReturnChannel())); connect(ui->returnSwButton, SIGNAL(clicked()), this, SLOT(identifyReturnChannel()));
connect(ui->flapsButton, SIGNAL(clicked()), this, SLOT(identifyFlapsChannel())); connect(ui->flapsButton, SIGNAL(clicked()), this, SLOT(identifyFlapsChannel()));
connect(ui->aux1Button, SIGNAL(clicked()), this, SLOT(identifyAux1Channel())); connect(ui->aux1Button, SIGNAL(clicked()), this, SLOT(identifyAux1Channel()));
...@@ -1409,10 +1409,10 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval) ...@@ -1409,10 +1409,10 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
ui->modeSpinBox->setValue(chan + 1); ui->modeSpinBox->setValue(chan + 1);
break; break;
case 5: case 5:
ui->assistSwSpinBox->setValue(chan + 1); ui->posctlSwSpinBox->setValue(chan + 1);
break; break;
case 6: case 6:
ui->missionSwSpinBox->setValue(chan + 1); ui->loiterSwSpinBox->setValue(chan + 1);
break; break;
case 7: case 7:
ui->returnSwSpinBox->setValue(chan + 1); ui->returnSwSpinBox->setValue(chan + 1);
...@@ -1565,10 +1565,10 @@ void QGCPX4VehicleConfig::updateAllInvertedCheckboxes() ...@@ -1565,10 +1565,10 @@ void QGCPX4VehicleConfig::updateAllInvertedCheckboxes()
//ui->radio5Widget->setName(tr("Mode Switch (#%1)").arg(rcMapping[4] + 1)); //ui->radio5Widget->setName(tr("Mode Switch (#%1)").arg(rcMapping[4] + 1));
break; break;
case 5: case 5:
ui->assistSwInvertCheckBox->setChecked(rcRev[rc_input_index]); ui->posctlSwInvertCheckBox->setChecked(rcRev[rc_input_index]);
break; break;
case 6: case 6:
ui->missionSwInvertCheckBox->setChecked(rcRev[rc_input_index]); ui->loiterSwInvertCheckBox->setChecked(rcRev[rc_input_index]);
break; break;
case 7: case 7:
ui->returnSwInvertCheckBox->setChecked(rcRev[rc_input_index]); ui->returnSwInvertCheckBox->setChecked(rcRev[rc_input_index]);
...@@ -1692,13 +1692,13 @@ void QGCPX4VehicleConfig::handleRcParameterChange(QString parameterName, QVarian ...@@ -1692,13 +1692,13 @@ void QGCPX4VehicleConfig::handleRcParameterChange(QString parameterName, QVarian
} }
else if (parameterName.startsWith("RC_MAP_POSCTL_SW")) { else if (parameterName.startsWith("RC_MAP_POSCTL_SW")) {
setChannelToFunctionMapping(5, intValue); setChannelToFunctionMapping(5, intValue);
ui->assistSwSpinBox->setValue(rcMapping[5]+1); ui->posctlSwSpinBox->setValue(rcMapping[5]+1);
ui->assistSwSpinBox->setEnabled(true); ui->posctlSwSpinBox->setEnabled(true);
} }
else if (parameterName.startsWith("RC_MAP_LOITER_SW")) { else if (parameterName.startsWith("RC_MAP_LOITER_SW")) {
setChannelToFunctionMapping(6, intValue); setChannelToFunctionMapping(6, intValue);
ui->missionSwSpinBox->setValue(rcMapping[6]+1); ui->loiterSwSpinBox->setValue(rcMapping[6]+1);
ui->missionSwSpinBox->setEnabled(true); ui->loiterSwSpinBox->setEnabled(true);
} }
else if (parameterName.startsWith("RC_MAP_RETURN_SW")) { else if (parameterName.startsWith("RC_MAP_RETURN_SW")) {
setChannelToFunctionMapping(7, intValue); setChannelToFunctionMapping(7, intValue);
...@@ -1941,17 +1941,17 @@ void QGCPX4VehicleConfig::updateRcChanLabels() ...@@ -1941,17 +1941,17 @@ void QGCPX4VehicleConfig::updateRcChanLabels()
} }
if (rcValue[rcMapping[5]] != UINT16_MAX) { if (rcValue[rcMapping[5]] != UINT16_MAX) {
ui->assistSwChanLabel->setText(labelForRcValue(rcAssist)); ui->posctlSwChanLabel->setText(labelForRcValue(rcAssist));
} }
else { else {
ui->assistSwChanLabel->setText(blankLabel); ui->posctlSwChanLabel->setText(blankLabel);
} }
if (rcValue[rcMapping[6]] != UINT16_MAX) { if (rcValue[rcMapping[6]] != UINT16_MAX) {
ui->missionSwChanLabel->setText(labelForRcValue(rcLoiter)); ui->loiterSwChanLabel->setText(labelForRcValue(rcLoiter));
} }
else { else {
ui->missionSwChanLabel->setText(blankLabel); ui->loiterSwChanLabel->setText(blankLabel);
} }
if (rcValue[rcMapping[7]] != UINT16_MAX) { if (rcValue[rcMapping[7]] != UINT16_MAX) {
......
src/ui/QGCPX4VehicleConfig.ui
View file @ e1267cf4
This diff is collapsed.
src/ui/uas/UASControlWidget.cc
View file @ e1267cf4
...@@ -80,10 +80,10 @@ void UASControlWidget::updateModesList() ...@@ -80,10 +80,10 @@ void UASControlWidget::updateModesList()
px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_MANUAL; px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_MANUAL;
modes_list_px4[0].customMode = px4_cm.data; modes_list_px4[0].customMode = px4_cm.data;
modes_list_px4[1].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED; modes_list_px4[1].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED;
px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_SEATBELT; px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_ALTCTL;
modes_list_px4[1].customMode = px4_cm.data; modes_list_px4[1].customMode = px4_cm.data;
modes_list_px4[2].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED; modes_list_px4[2].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED;
px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_EASY; px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_POSCTL;
modes_list_px4[2].customMode = px4_cm.data; modes_list_px4[2].customMode = px4_cm.data;
modes_list_px4[3].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED; modes_list_px4[3].baseMode = MAV_MODE_FLAG_CUSTOM_MODE_ENABLED | MAV_MODE_FLAG_AUTO_ENABLED | MAV_MODE_FLAG_STABILIZE_ENABLED | MAV_MODE_FLAG_GUIDED_ENABLED;
px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_AUTO; px4_cm.main_mode = PX4_CUSTOM_MAIN_MODE_AUTO;
......
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