Commit c96b1359 authored by Lorenz Meier's avatar Lorenz Meier

Follow through with mission to loiter switch renaming

parent b5920a35
...@@ -50,7 +50,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -50,7 +50,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcThrottle(0.0f), rcThrottle(0.0f),
rcMode(0.0f), rcMode(0.0f),
rcAssist(0.0f), rcAssist(0.0f),
rcMission(0.0f), rcLoiter(0.0f),
rcReturn(0.0f), rcReturn(0.0f),
rcFlaps(0.0f), rcFlaps(0.0f),
rcAux1(0.0f), rcAux1(0.0f),
...@@ -72,7 +72,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) : ...@@ -72,7 +72,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
channelNames << "Throttle"; channelNames << "Throttle";
channelNames << "Main Mode Switch"; channelNames << "Main Mode Switch";
channelNames << "Assist Switch"; channelNames << "Assist Switch";
channelNames << "Mission Switch"; channelNames << "Loiter Switch";
channelNames << "Return Switch"; channelNames << "Return Switch";
channelNames << "Flaps"; channelNames << "Flaps";
channelNames << "Aux1"; channelNames << "Aux1";
...@@ -1484,7 +1484,7 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval) ...@@ -1484,7 +1484,7 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
rcAssist = normalized; // ASSIST SWITCH rcAssist = normalized; // ASSIST SWITCH
} }
else if (chan == rcMapping[6]) { else if (chan == rcMapping[6]) {
rcMission = normalized; // MISSION SWITCH rcLoiter = normalized; // LOITER SWITCH
} }
else if (chan == rcMapping[7]) { else if (chan == rcMapping[7]) {
rcReturn = normalized; // RETURN SWITCH rcReturn = normalized; // RETURN SWITCH
...@@ -1948,7 +1948,7 @@ void QGCPX4VehicleConfig::updateRcChanLabels() ...@@ -1948,7 +1948,7 @@ void QGCPX4VehicleConfig::updateRcChanLabels()
} }
if (rcValue[rcMapping[6]] != UINT16_MAX) { if (rcValue[rcMapping[6]] != UINT16_MAX) {
ui->missionSwChanLabel->setText(labelForRcValue(rcMission)); ui->missionSwChanLabel->setText(labelForRcValue(rcLoiter));
} }
else { else {
ui->missionSwChanLabel->setText(blankLabel); ui->missionSwChanLabel->setText(blankLabel);
......
...@@ -306,7 +306,7 @@ protected: ...@@ -306,7 +306,7 @@ protected:
float rcThrottle; ///< PPM input channel used as throttle control input float rcThrottle; ///< PPM input channel used as throttle control input
float rcMode; ///< PPM input channel used as mode switch control input float rcMode; ///< PPM input channel used as mode switch control input
float rcAssist; ///< PPM input channel used as assist switch control input float rcAssist; ///< PPM input channel used as assist switch control input
float rcMission; ///< PPM input channel used as mission switch control input float rcLoiter; ///< PPM input channel used as loiter switch control input
float rcReturn; ///< PPM input channel used as return switch control input float rcReturn; ///< PPM input channel used as return switch control input
float rcFlaps; ///< PPM input channel used as flaps control input float rcFlaps; ///< PPM input channel used as flaps control input
float rcAux1; ///< PPM input channel used as aux 1 input float rcAux1; ///< PPM input channel used as aux 1 input
......
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