Merge pull request #1716 from DonLakeFlyer/FlightModeConfig

Flight Mode config redesign

qgroundcontrol.qrc

@@ -93,6 +93,7 @@
         <file alias="QGroundControl/Controls/QGCViewMessage.qml">src/QmlControls/QGCViewMessage.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
         <file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
+        <file alias="QGroundControl/Controls/ModeSwitchDisplay.qml">src/QmlControls/ModeSwitchDisplay.qml</file>
         <file alias="ParameterEditorWidget.qml">src/ViewWidgets/ParameterEditorWidget.qml</file>
         <file alias="CustomCommandWidget.qml">src/ViewWidgets/CustomCommandWidget.qml</file>
         <file alias="SetupView.qml">src/VehicleSetup/SetupView.qml</file>

src/AutoPilotPlugins/PX4/FlightModesComponentController.cc

@@ -33,31 +33,115 @@
 #include <QQmlProperty>
 
 FlightModesComponentController::FlightModesComponentController(void) :
-    _liveRCValues(false),
     _validConfiguration(false),
-    _channelCount(18)
+    _channelCount(18),
+    _manualModeSelected(false),
+    _assistModeSelected(false),
+    _autoModeSelected(false),
+    _acroModeSelected(false),
+    _altCtlModeSelected(false),
+    _posCtlModeSelected(false),
+    _missionModeSelected(false),
+    _loiterModeSelected(false),
+    _returnModeSelected(false),
+    _offboardModeSelected(false)
 {
     QStringList usedParams;
-    usedParams << "RC_MAP_THROTTLE" << "RC_MAP_YAW" << "RC_MAP_PITCH" << "RC_MAP_ROLL" << "RC_MAP_FLAPS" << "RC_MAP_AUX1" << "RC_MAP_AUX2" << "RC_MAP_ACRO_SW";
+    usedParams << "RC_MAP_THROTTLE" << "RC_MAP_YAW" << "RC_MAP_PITCH" << "RC_MAP_ROLL" << "RC_MAP_FLAPS" << "RC_MAP_AUX1" << "RC_MAP_AUX2" <<
+        "RC_MAP_MODE_SW" << "RC_MAP_RETURN_SW" << "RC_MAP_LOITER_SW" << "RC_MAP_POSCTL_SW" << "RC_MAP_OFFB_SW" << "RC_MAP_ACRO_SW";
     if (!_allParametersExists(FactSystem::defaultComponentId, usedParams)) {
         return;
     }
-    
+
-    _initRcValues();
+    _init();
     _validateConfiguration();
+    
+    connect(_uas, &UASInterface::remoteControlChannelRawChanged, this, &FlightModesComponentController::_remoteControlChannelRawChanged);
 }
 
 FlightModesComponentController::~FlightModesComponentController()
 {
-    setSendLiveRCSwitchRanges(false);
+    disconnect(_uas, &UASInterface::remoteControlChannelRawChanged, this, &FlightModesComponentController::_remoteControlChannelRawChanged);
 }
 
-
+void FlightModesComponentController::_init(void)
-void FlightModesComponentController::_initRcValues(void)
 {
-    for (int i=0; i<_chanMax; i++) {
+    // FIXME: What about VTOL? That confuses the whole Flight Mode naming scheme
-        _rcValues << 1.0;
+    _fixedWing = _uas->getSystemType() == MAV_TYPE_FIXED_WING;
+    
+    // We need to know min and max for channel in order to calculate percentage range
+    for (int channel=0; channel<_chanMax; channel++) {
+        QString rcMinParam, rcMaxParam, rcRevParam;
+        
+        rcMinParam = QString("RC%1_MIN").arg(channel+1);
+        rcMaxParam = QString("RC%1_MAX").arg(channel+1);
+        rcRevParam = QString("RC%1_REV").arg(channel+1);
+        
+        QVariant value;
+        
+        _rgRCMin[channel] = getParameterFact(FactSystem::defaultComponentId, rcMinParam)->value().toInt();
+        _rgRCMax[channel] = getParameterFact(FactSystem::defaultComponentId, rcMaxParam)->value().toInt();
+        
+        float floatReversed = getParameterFact(-1, rcRevParam)->value().toFloat();
+        _rgRCReversed[channel] = floatReversed == -1.0f;
+        
+        _rcValues[channel] = 0.0;
     }
+
+    // RC_CHAN_CNT parameter is set by Radio Cal to specify the number of radio channels.
+    if (parameterExists(FactSystem::defaultComponentId, "RC_CHAN_CNT")) {
+        _channelCount = getParameterFact(FactSystem::defaultComponentId, "RC_CHAN_CNT")->value().toInt();
+    } else {
+        _channelCount =_chanMax;
+    }
+    if (_channelCount <= 0 || _channelCount > _chanMax) {
+        // Parameter exists, but has not yet been set or is invalid. Use default
+        _channelCount = _chanMax;
+    }
+    
+    int modeChannel = getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt();
+    int posCtlChannel = getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt();
+    int loiterChannel = getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt();
+    
+    if (posCtlChannel == 0) {
+        // PosCtl disabled so AltCtl must move back to main Mode switch
+        _assistModeVisible = false;
+    } else {
+        // Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch
+        _assistModeVisible = posCtlChannel != modeChannel;
+    }
+    
+    if (loiterChannel == 0) {
+        // Loiter disabled so Mission must move back to main Mode switch
+        _autoModeVisible = false;
+    } else {
+        // Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch
+        _autoModeVisible = loiterChannel != modeChannel;
+    }
+    
+    // Setup the channel combobox model
+    
+    QList<int> usedChannels;
+    QStringList attitudeParams;
+    
+    attitudeParams << "RC_MAP_THROTTLE" << "RC_MAP_YAW" << "RC_MAP_PITCH" << "RC_MAP_ROLL" << "RC_MAP_FLAPS" << "RC_MAP_AUX1" << "RC_MAP_AUX2";
+    foreach(QString attitudeParam, attitudeParams) {
+        int channel = getParameterFact(-1, attitudeParam)->value().toInt();
+        if (channel != 0) {
+            usedChannels << channel;
+        }
+    }
+    
+    _channelListModel << "Disabled";
+    _channelListModelChannel << 0;
+    for (int channel=1; channel<_channelCount; channel++) {
+        if (!usedChannels.contains(channel)) {
+            _channelListModel << QString("Channel %1").arg(channel);
+            _channelListModelChannel << channel;
+        }
+    }
+    
+    _recalcModeRows();
 }
 
 /// This will look for parameter settings which would cause the config to not run correctly.
@@ -66,19 +150,12 @@ void FlightModesComponentController::_validateConfiguration(void)
 {
     _validConfiguration = true;
     
-    _channelCount = parameterExists(FactSystem::defaultComponentId, "RC_CHAN_CNT") ? getParameterFact(FactSystem::defaultComponentId, "RC_CHAN_CNT")->value().toInt() : _chanMax;
-    if (_channelCount <= 0 || _channelCount > _chanMax) {
-        // Parameter exists, but has not yet been set or is invalid. Use default
-        _channelCount = _chanMax;
-    }
-    
     // Make sure switches are valid and within channel range
     
-    QStringList switchParams, switchNames;
+    QStringList switchParams;
     QList<int> switchMappings;
     
-    switchParams << "RC_MAP_MODE_SW" << "RC_MAP_RETURN_SW" << "RC_MAP_LOITER_SW" << "RC_MAP_POSCTL_SW" << "RC_MAP_OFFB_SW" << "RC_MAP_ACRO_SW";
+    switchParams << "RC_MAP_MODE_SW"  << "RC_MAP_ACRO_SW"  << "RC_MAP_POSCTL_SW" << "RC_MAP_LOITER_SW" << "RC_MAP_RETURN_SW" << "RC_MAP_OFFB_SW";
-    switchNames << "Mode Switch" << "Return Switch" << "Loiter Switch" << "PosCtl Switch" << "Offboard Switch" << "Acro Switch";
     
     for(int i=0; i<switchParams.count(); i++) {
         int map = getParameterFact(FactSystem::defaultComponentId, switchParams[i])->value().toInt();
@@ -86,16 +163,15 @@ void FlightModesComponentController::_validateConfiguration(void)
         
         if (map < 0 || map > _channelCount) {
             _validConfiguration = false;
-            _configurationErrors += QString("%1 is set to %2. Mapping must between 0 and %3 (inclusive).\n").arg(switchNames[i]).arg(map).arg(_channelCount);
+            _configurationErrors += QString("%1 is set to %2. Mapping must between 0 and %3 (inclusive).\n").arg(switchParams[i]).arg(map).arg(_channelCount);
         }
     }
     
-    // Make sure switches are not double-mapped
+    // Make sure mode switches are not double-mapped
     
-    QStringList attitudeParams, attitudeNames;
+    QStringList attitudeParams;
     
     attitudeParams << "RC_MAP_THROTTLE" << "RC_MAP_YAW" << "RC_MAP_PITCH" << "RC_MAP_ROLL" << "RC_MAP_FLAPS" << "RC_MAP_AUX1" << "RC_MAP_AUX2";
-    attitudeNames << "Throttle" << "Yaw" << "Pitch" << "Roll" << "Flaps" << "Aux1" << "Aux2";
 
     for (int i=0; i<attitudeParams.count(); i++) {
         int map = getParameterFact(FactSystem::defaultComponentId, attitudeParams[i])->value().toInt();
@@ -103,58 +179,23 @@ void FlightModesComponentController::_validateConfiguration(void)
         for (int j=0; j<switchParams.count(); j++) {
             if (map != 0 && map == switchMappings[j]) {
                 _validConfiguration = false;
-                _configurationErrors += QString("%1 is set to same channel as %2.\n").arg(switchNames[j]).arg(attitudeNames[i]);
+                _configurationErrors += QString("%1 is set to same channel as %2.\n").arg(switchParams[j]).arg(attitudeParams[i]);
             }
         }
     }
     
-    // Check for switches that must be on their own channel
+    // Validate thresholds within range
     
-    QStringList singleSwitchParams, singleSwitchNames;
+    QStringList thresholdParams;
     
-    singleSwitchParams << "RC_MAP_RETURN_SW" << "RC_MAP_OFFB_SW";
+    thresholdParams << "RC_ASSIST_TH" << "RC_AUTO_TH" << "RC_ACRO_TH" << "RC_POSCTL_TH" << "RC_LOITER_TH" << "RC_RETURN_TH" << "RC_OFFB_TH";
-    singleSwitchNames << "Return Switch" << "Offboard Switch";
     
-    for (int i=0; i<singleSwitchParams.count(); i++) {
+    foreach(QString thresholdParam, thresholdParams) {
-        int map = getParameterFact(FactSystem::defaultComponentId, singleSwitchParams[i])->value().toInt();
+        float threshold = getParameterFact(-1, thresholdParam)->value().toFloat();
-        
+        if (threshold < 0.0f || threshold > 1.0f) {
-        for (int j=0; j<switchParams.count(); j++) {
+            _validConfiguration = false;
-            if (map != 0 && singleSwitchParams[i] != switchParams[j] && map == switchMappings[j]) {
+            _configurationErrors += QString("%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).\n").arg(thresholdParam).arg(threshold);
-                _validConfiguration = false;
-                _configurationErrors += QString("%1 must be on seperate channel, but is set to same channel as %2.\n").arg(singleSwitchNames[i]).arg(switchParams[j]);
-            }
-        }
-    }
-}
-
-void FlightModesComponentController::setSendLiveRCSwitchRanges(bool start)
-{
-    if (start) {
-        
-        // We need to know min and max for channel in order to calculate percentage range
-        for (int i=0; i<_chanMax; i++) {
-            QString rcMinParam, rcMaxParam, rcRevParam;
-            
-            rcMinParam = QString("RC%1_MIN").arg(i+1);
-            rcMaxParam = QString("RC%1_MAX").arg(i+1);
-            rcRevParam = QString("RC%1_REV").arg(i+1);
-            
-            QVariant value;
-            
-            _rgRCMin[i] = getParameterFact(FactSystem::defaultComponentId, rcMinParam)->value().toInt();
-            _rgRCMax[i] = getParameterFact(FactSystem::defaultComponentId, rcMaxParam)->value().toInt();
-            
-            float floatReversed = getParameterFact(-1, rcRevParam)->value().toFloat();
-            _rgRCReversed[i] = floatReversed == -1.0f;
         }
-        
-        _uas->startCalibration(UASInterface::StartCalibrationRadio);
-        connect(_uas, &UASInterface::remoteControlChannelRawChanged, this, &FlightModesComponentController::_remoteControlChannelRawChanged);
-    } else {
-        disconnect(_uas, &UASInterface::remoteControlChannelRawChanged, this, &FlightModesComponentController::_remoteControlChannelRawChanged);
-        _uas->stopCalibration();
-        _initRcValues();
-        emit switchLiveRangeChanged();
     }
 }
 
@@ -178,6 +219,9 @@ void FlightModesComponentController::_remoteControlChannelRawChanged(int chan, f
     }
     
     _rcValues[chan] = percentRange;
+    
+    _recalcModeSelections();
+    
     emit switchLiveRangeChanged();
 }
 
@@ -187,38 +231,582 @@ double FlightModesComponentController::_switchLiveRange(const QString& param)
     
     int channel = getParameterFact(-1, param)->value().toInt();
     if (channel == 0) {
-        return 1.0;
+        return 0.0;
     } else {
         return _rcValues[channel - 1];
     }
 }
 
-double FlightModesComponentController::modeSwitchLiveRange(void)
+double FlightModesComponentController::manualModeRcValue(void)
 {
     return _switchLiveRange("RC_MAP_MODE_SW");
 }
 
-double FlightModesComponentController::returnSwitchLiveRange(void)
+double FlightModesComponentController::assistModeRcValue(void)
+{
+    return manualModeRcValue();
+}
+
+double FlightModesComponentController::autoModeRcValue(void)
+{
+    return manualModeRcValue();
+}
+
+double FlightModesComponentController::acroModeRcValue(void)
+{
+    return _switchLiveRange("RC_MAP_ACRO_SW");
+}
+
+double FlightModesComponentController::altCtlModeRcValue(void)
+{
+    int posCtlSwitchChannel = getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt();
+    
+    if (posCtlSwitchChannel == 0) {
+        return _switchLiveRange("RC_MAP_MODE_SW");
+    } else {
+        return _switchLiveRange("RC_MAP_POSCTL_SW");
+    }
+}
+
+double FlightModesComponentController::posCtlModeRcValue(void)
+{
+    return _switchLiveRange("RC_MAP_POSCTL_SW");
+}
+
+double FlightModesComponentController::missionModeRcValue(void)
+{
+    int returnSwitchChannel = getParameterFact(-1, "RC_MAP_RETURN_SW")->value().toInt();
+    int loiterSwitchChannel = getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt();
+
+    const char* switchChannelParam = "RC_MAP_MODE_SW";
+    
+    if (returnSwitchChannel == 0) {
+        if (loiterSwitchChannel != 0) {
+            switchChannelParam = "RC_MAP_LOITER_SW";
+        }
+    } else {
+        if (loiterSwitchChannel == 0) {
+            switchChannelParam = "RC_MAP_RETURN_SW";
+        } else {
+            switchChannelParam = "RC_MAP_LOITER_SW";
+        }
+    }
+    
+    return _switchLiveRange(switchChannelParam);
+}
+
+double FlightModesComponentController::loiterModeRcValue(void)
+{
+    return _switchLiveRange("RC_MAP_LOITER_SW");
+}
+
+double FlightModesComponentController::returnModeRcValue(void)
 {
     return _switchLiveRange("RC_MAP_RETURN_SW");
 }
 
-double FlightModesComponentController::offboardSwitchLiveRange(void)
+double FlightModesComponentController::offboardModeRcValue(void)
 {
     return _switchLiveRange("RC_MAP_OFFB_SW");
 }
 
-double FlightModesComponentController::loiterSwitchLiveRange(void)
+void FlightModesComponentController::_recalcModeSelections(void)
 {
-    return _switchLiveRange("RC_MAP_LOITER_SW");
+    _manualModeSelected = false;
+    _assistModeSelected = false;
+    _autoModeSelected = false;
+    _acroModeSelected = false;
+    _altCtlModeSelected = false;
+    _posCtlModeSelected = false;
+    _missionModeSelected = false;
+    _loiterModeSelected = false;
+    _returnModeSelected = false;
+    _offboardModeSelected = false;
+    
+    // Convert channels to 0-based, -1 signals not mapped
+    int modeSwitchChannel =     getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt() - 1;
+    int acroSwitchChannel =     getParameterFact(-1, "RC_MAP_ACRO_SW")->value().toInt() - 1;
+    int posCtlSwitchChannel =   getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt() - 1;
+    int loiterSwitchChannel =   getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt() - 1;
+    int returnSwitchChannel =   getParameterFact(-1, "RC_MAP_RETURN_SW")->value().toInt() - 1;
+    int offboardSwitchChannel = getParameterFact(-1, "RC_MAP_OFFB_SW")->value().toInt() - 1;
+    
+    double autoThreshold =      getParameterFact(-1, "RC_AUTO_TH")->value().toDouble();
+    double assistThreshold =    getParameterFact(-1, "RC_ASSIST_TH")->value().toDouble();
+    double acroThreshold =      getParameterFact(-1, "RC_ACRO_TH")->value().toDouble();
+    double posCtlThreshold =    getParameterFact(-1, "RC_POSCTL_TH")->value().toDouble();
+    double loiterThreshold =    getParameterFact(-1, "RC_LOITER_TH")->value().toDouble();
+    double returnThreshold =    getParameterFact(-1, "RC_RETURN_TH")->value().toDouble();
+    double offboardThreshold =  getParameterFact(-1, "RC_OFFB_TH")->value().toDouble();
+    
+    if (modeSwitchChannel >= 0) {
+        if (offboardSwitchChannel >= 0 && _rcValues[offboardSwitchChannel] >= offboardThreshold) {
+            _offboardModeSelected = true;
+        } else if (returnSwitchChannel >= 0 && _rcValues[returnSwitchChannel] >= returnThreshold) {
+            _returnModeSelected = true;
+        } else {
+            if (_rcValues[modeSwitchChannel] >= autoThreshold) {
+                _autoModeSelected = true;
+                if (loiterSwitchChannel >= 0 && _rcValues[loiterSwitchChannel] >= loiterThreshold) {
+                    _loiterModeSelected = true;
+                } else {
+                    _missionModeSelected = true;
+                }
+            } else if (_rcValues[modeSwitchChannel] >= assistThreshold) {
+                _assistModeSelected = true;
+                if (posCtlSwitchChannel >= 0 && _rcValues[posCtlSwitchChannel] >= posCtlThreshold) {
+                    _posCtlModeSelected = true;
+                } else {
+                    _altCtlModeSelected = true;
+                }
+            } else if (acroSwitchChannel >= 0 && _rcValues[acroSwitchChannel] >= acroThreshold) {
+                _acroModeSelected = true;
+            } else {
+                _manualModeSelected = true;
+            }
+        }
+    }
+    
+    emit modesSelectedChanged();
 }
 
-double FlightModesComponentController::posCtlSwitchLiveRange(void)
+void FlightModesComponentController::_recalcModeRows(void)
 {
-    return _switchLiveRange("RC_MAP_POSCTL_SW");
+    int modeSwitchChannel =     getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt();
+    int acroSwitchChannel =     getParameterFact(-1, "RC_MAP_ACRO_SW")->value().toInt();
+    int posCtlSwitchChannel =   getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt();
+    int loiterSwitchChannel =   getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt();
+    int returnSwitchChannel =   getParameterFact(-1, "RC_MAP_RETURN_SW")->value().toInt();
+    int offboardSwitchChannel = getParameterFact(-1, "RC_MAP_OFFB_SW")->value().toInt();
+    
+    if (modeSwitchChannel == 0) {
+        _acroModeRow =      0;
+        _assistModeRow =    1;
+        _autoModeRow =      2;
+        _altCtlModeRow =    3;
+        _posCtlModeRow =    4;
+        _loiterModeRow =    5;
+        _missionModeRow =   6;
+        _returnModeRow =    7;
+        _offboardModeRow =  8;
+    } else {
+        int row = 0;
+        
+        // First set is all switches on main mode channel
+        
+        if (acroSwitchChannel == modeSwitchChannel) {
+            _acroModeRow = row++;
+        }
+        _assistModeRow = row++;
+        if (posCtlSwitchChannel == modeSwitchChannel) {
+            _altCtlModeRow = row++;
+            _posCtlModeRow = row++;
+        } else if (posCtlSwitchChannel == 0) {
+            _altCtlModeRow = row++;
+        }
+        _autoModeRow = row++;
+        if (loiterSwitchChannel == modeSwitchChannel) {
+            _missionModeRow = row++;
+            _loiterModeRow = row++;
+        } else if (loiterSwitchChannel == 0) {
+            _missionModeRow = row++;
+        }
+        if (returnSwitchChannel == modeSwitchChannel) {
+            _returnModeRow = row++;
+        }
+        if (offboardSwitchChannel == modeSwitchChannel) {
+            _offboardModeRow = row++;
+        }
+        
+        // Now individual enabled switches not on main mode channel
+        
+        if (acroSwitchChannel != 0 && acroSwitchChannel != modeSwitchChannel) {
+            _acroModeRow = row++;
+        }
+        if (posCtlSwitchChannel != 0 && posCtlSwitchChannel != modeSwitchChannel) {
+            _altCtlModeRow = row++;
+            _posCtlModeRow = row++;
+        }
+        if (loiterSwitchChannel != 0 && loiterSwitchChannel != modeSwitchChannel) {
+            _missionModeRow = row++;
+            _loiterModeRow = row++;
+        }
+        if (returnSwitchChannel != 0 && returnSwitchChannel != modeSwitchChannel) {
+            _returnModeRow = row++;
+        }
+        if (offboardSwitchChannel != 0 && offboardSwitchChannel != modeSwitchChannel) {
+            _offboardModeRow = row++;
+        }
+        
+        // Now disabled switches
+        
+        if (acroSwitchChannel == 0) {
+            _acroModeRow = row++;
+        }
+        if (posCtlSwitchChannel == 0) {
+            _posCtlModeRow = row++;
+        }
+        if (loiterSwitchChannel == 0) {
+            _loiterModeRow = row++;
+        }
+        if (returnSwitchChannel == 0) {
+            _returnModeRow = row++;
+        }
+        if (offboardSwitchChannel == 0) {
+            _offboardModeRow = row++;
+        }
+    }
+    
+    emit modeRowsChanged();
 }
 
-double FlightModesComponentController::acroSwitchLiveRange(void)
+double FlightModesComponentController::manualModeThreshold(void)
 {
-    return _switchLiveRange("RC_MAP_ACRO_SW");
+    return 0.0;
+}
+
+double FlightModesComponentController::assistModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_ASSIST_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::autoModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_AUTO_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::acroModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_ACRO_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::altCtlModeThreshold(void)
+{
+    return _assistModeVisible ? 0.0 : getParameterFact(-1, "RC_ASSIST_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::posCtlModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_POSCTL_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::missionModeThreshold(void)
+{
+    return _autoModeVisible ? 0.0 : getParameterFact(-1, "RC_AUTO_TH")->value().toDouble();
+}
+
+
+double FlightModesComponentController::loiterModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_LOITER_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::returnModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_RETURN_TH")->value().toDouble();
+}
+
+double FlightModesComponentController::offboardModeThreshold(void)
+{
+    return getParameterFact(-1, "RC_OFFB_TH")->value().toDouble();
+}
+
+void FlightModesComponentController::setAssistModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_ASSIST_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setAutoModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_AUTO_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setAcroModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_ACRO_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setAltCtlModeThreshold(double threshold)
+{
+    setAssistModeThreshold(threshold);
+}
+
+void FlightModesComponentController::setPosCtlModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_POSCTL_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setMissionModeThreshold(double threshold)
+{
+    setAutoModeThreshold(threshold);
+}
+
+void FlightModesComponentController::setLoiterModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_LOITER_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setReturnModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_RETURN_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+void FlightModesComponentController::setOffboardModeThreshold(double threshold)
+{
+    getParameterFact(-1, "RC_OFFB_TH")->setValue(threshold);
+    _recalcModeSelections();
+}
+
+int FlightModesComponentController::_channelToChannelIndex(int channel)
+{
+    return _channelListModelChannel.lastIndexOf(channel);
+}
+
+int FlightModesComponentController::_channelToChannelIndex(const QString& channelParam)
+{
+    return _channelToChannelIndex(getParameterFact(-1, channelParam)->value().toInt());
+}
+
+int FlightModesComponentController::manualModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_MODE_SW");
+}
+
+int FlightModesComponentController::assistModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_MODE_SW");
+}
+
+int FlightModesComponentController::autoModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_MODE_SW");
+}
+
+int FlightModesComponentController::acroModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_ACRO_SW");
+}
+
+int FlightModesComponentController::altCtlModeChannelIndex(void)
+{
+    int posCtlSwitchChannel = getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt();
+    
+    if (posCtlSwitchChannel == 0) {
+        return _channelToChannelIndex("RC_MAP_MODE_SW");
+    } else {
+        return _channelToChannelIndex(posCtlSwitchChannel);
+    }
+}
+
+int FlightModesComponentController::posCtlModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_POSCTL_SW");
+}
+
+int FlightModesComponentController::loiterModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_LOITER_SW");
+}
+
+int FlightModesComponentController::missionModeChannelIndex(void)
+{
+    int loiterSwitchChannel = getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt();
+    
+    if (loiterSwitchChannel == 0) {
+        return _channelToChannelIndex("RC_MAP_MODE_SW");
+    } else {
+        return _channelToChannelIndex(loiterSwitchChannel);
+    }
+}
+
+int FlightModesComponentController::returnModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_RETURN_SW");
+}
+
+int FlightModesComponentController::offboardModeChannelIndex(void)
+{
+    return _channelToChannelIndex("RC_MAP_OFFB_SW");
+}
+
+int FlightModesComponentController::_channelIndexToChannel(int index)
+{
+    return _channelListModelChannel[index];
+}
+
+void FlightModesComponentController::setManualModeChannelIndex(int index)
+{
+    getParameterFact(-1, "RC_MAP_MODE_SW")->setValue(_channelIndexToChannel(index));
+    
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::setAcroModeChannelIndex(int index)
+{
+    getParameterFact(-1, "RC_MAP_ACRO_SW")->setValue(_channelIndexToChannel(index));
+    
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::setPosCtlModeChannelIndex(int index)
+{
+    int channel = _channelIndexToChannel(index);
+    
+    getParameterFact(-1, "RC_MAP_POSCTL_SW")->setValue(channel);
+    
+    if (channel == 0) {
+        // PosCtl disabled so AltCtl must move back to main Mode switch
+        _assistModeVisible = false;
+    } else {
+        // Assist mode is visible if AltCtl/PosCtl are on seperate channel from main Mode switch
+        _assistModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt();
+    }
+    
+    emit altCtlModeChannelIndexChanged(index);
+    emit modesVisibleChanged();
+
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::setLoiterModeChannelIndex(int index)
+{
+    int channel = _channelIndexToChannel(index);
+    
+    getParameterFact(-1, "RC_MAP_LOITER_SW")->setValue(channel);
+    
+    if (channel == 0) {
+        // Loiter disabled so Mission must move back to main Mode switch
+        _autoModeVisible = false;
+    } else {
+        // Auto mode is visible if Mission/Loiter are on seperate channel from main Mode switch
+        _autoModeVisible = channel != getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt();
+    }
+    
+    emit missionModeChannelIndexChanged(index);
+    emit modesVisibleChanged();
+    
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::setReturnModeChannelIndex(int index)
+{
+    getParameterFact(-1, "RC_MAP_RETURN_SW")->setValue(_channelIndexToChannel(index));
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::setOffboardModeChannelIndex(int index)
+{
+    getParameterFact(-1, "RC_MAP_OFFB_SW")->setValue(_channelIndexToChannel(index));
+    _recalcModeSelections();
+    _recalcModeRows();
+}
+
+void FlightModesComponentController::generateThresholds(void)
+{
+    // Reset all thresholds to 0.0
+    
+    QStringList thresholdParams;
+    
+    thresholdParams << "RC_ASSIST_TH" << "RC_AUTO_TH" << "RC_ACRO_TH" << "RC_POSCTL_TH" << "RC_LOITER_TH" << "RC_RETURN_TH" << "RC_OFFB_TH";
+    
+    foreach(QString thresholdParam, thresholdParams) {
+        getParameterFact(-1, thresholdParam)->setValue(0.0f);
+    }
+    
+    // Redistribute
+    
+    int modeChannel =       getParameterFact(-1, "RC_MAP_MODE_SW")->value().toInt();
+    int acroChannel =       getParameterFact(-1, "RC_MAP_ACRO_SW")->value().toInt();
+    int posCtlChannel =     getParameterFact(-1, "RC_MAP_POSCTL_SW")->value().toInt();
+    int loiterChannel =     getParameterFact(-1, "RC_MAP_LOITER_SW")->value().toInt();
+    int returnChannel =     getParameterFact(-1, "RC_MAP_RETURN_SW")->value().toInt();
+    int offboardChannel =   getParameterFact(-1, "RC_MAP_OFFB_SW")->value().toInt();
+    
+    if (modeChannel != 0) {
+        int positions = 3;  // Manual/Assist/Auto always exist
+        
+        bool acroOnModeSwitch = modeChannel == acroChannel;
+        bool posCtlOnModeSwitch = modeChannel == posCtlChannel;
+        bool loiterOnModeSwitch = modeChannel == loiterChannel;
+        bool returnOnModeSwitch = modeChannel == returnChannel;
+        bool offboardOnModeSwitch = modeChannel == offboardChannel;
+        
+        positions += acroOnModeSwitch ? 1 : 0;
+        positions += posCtlOnModeSwitch ? 1 : 0;
+        positions += loiterOnModeSwitch ? 1 : 0;
+        positions += returnOnModeSwitch ? 1 : 0;
+        positions += offboardOnModeSwitch ? 1 : 0;
+        
+        float increment = 1.0f / positions;
+        float currentThreshold = 0.0f;
+        
+        if (acroOnModeSwitch) {
+            currentThreshold += increment;
+            getParameterFact(-1, "RC_ACRO_TH")->setValue(currentThreshold);
+            acroChannel = 0;
+        }
+        
+        currentThreshold += increment;
+        getParameterFact(-1, "RC_ASSIST_TH")->setValue(currentThreshold);
+        if (posCtlOnModeSwitch) {
+            currentThreshold += increment;
+            getParameterFact(-1, "RC_POSCTL_TH")->setValue(currentThreshold);
+            posCtlChannel = 0;
+        }
+        
+        currentThreshold += increment;
+        getParameterFact(-1, "RC_AUTO_TH")->setValue(currentThreshold);
+        if (loiterOnModeSwitch) {
+            currentThreshold += increment;
+            getParameterFact(-1, "RC_LOITER_TH")->setValue(currentThreshold);
+            loiterChannel = 0;
+        }
+        
+        if (returnOnModeSwitch) {
+            currentThreshold += increment;
+            getParameterFact(-1, "RC_RETURN_TH")->setValue(currentThreshold);
+            returnChannel = 0;
+        }
+        
+        if (offboardOnModeSwitch) {
+            currentThreshold += increment;
+            getParameterFact(-1, "RC_OFFB_TH")->setValue(currentThreshold);
+            offboardChannel = 0;
+        }
+    }
+    
+    if (acroChannel != 0) {
+        // If only two positions don't set threshold at midrange. Setting to 0.25
+        // allows for this channel to work with either a two or three position switch
+        getParameterFact(-1, "RC_ACRO_TH")->setValue(0.25f);
+    }
+    
+    if (posCtlChannel != 0) {
+        getParameterFact(-1, "RC_POSCTL_TH")->setValue(0.25f);
+    }
+    
+    if (loiterChannel != 0) {
+        getParameterFact(-1, "RC_LOITER_TH")->setValue(0.25f);
+    }
+    
+    if (returnChannel != 0) {
+        getParameterFact(-1, "RC_RETURN_TH")->setValue(0.25f);
+    }
+    
+    if (offboardChannel != 0) {
+        getParameterFact(-1, "RC_OFFB_TH")->setValue(0.25f);
+    }
+    
+    emit thresholdsChanged();
 }

src/AutoPilotPlugins/PX4/FlightModesComponentController.h

@@ -30,6 +30,7 @@
 #include <QObject>
 #include <QQuickItem>
 #include <QList>
+#include <QStringList>
 
 #include "UASInterface.h"
 #include "AutoPilotPlugin.h"
@@ -48,49 +49,198 @@ public:
     Q_PROPERTY(QString configurationErrors MEMBER _configurationErrors CONSTANT)
     
     Q_PROPERTY(int channelCount MEMBER _channelCount CONSTANT)
+    Q_PROPERTY(bool fixedWing MEMBER _fixedWing CONSTANT)
     
-    Q_PROPERTY(double modeSwitchLiveRange READ modeSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int assistModeRow    MEMBER _assistModeRow   NOTIFY modeRowsChanged)
-    Q_PROPERTY(double loiterSwitchLiveRange READ loiterSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int autoModeRow      MEMBER _autoModeRow     NOTIFY modeRowsChanged)
-    Q_PROPERTY(double posCtlSwitchLiveRange READ posCtlSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int acroModeRow      MEMBER _acroModeRow     NOTIFY modeRowsChanged)
-    Q_PROPERTY(double returnSwitchLiveRange READ returnSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int altCtlModeRow    MEMBER _altCtlModeRow   NOTIFY modeRowsChanged)
-    Q_PROPERTY(double offboardSwitchLiveRange READ offboardSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int posCtlModeRow    MEMBER _posCtlModeRow   NOTIFY modeRowsChanged)
-    Q_PROPERTY(double acroSwitchLiveRange READ acroSwitchLiveRange NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(int loiterModeRow    MEMBER _loiterModeRow   NOTIFY modeRowsChanged)
+    Q_PROPERTY(int missionModeRow   MEMBER _missionModeRow  NOTIFY modeRowsChanged)
+    Q_PROPERTY(int returnModeRow    MEMBER _returnModeRow   NOTIFY modeRowsChanged)
+    Q_PROPERTY(int offboardModeRow  MEMBER _offboardModeRow NOTIFY modeRowsChanged)
     
-    Q_PROPERTY(bool sendLiveRCSwitchRanges READ sendLiveRCSwitchRanges WRITE setSendLiveRCSwitchRanges NOTIFY liveRCSwitchRangesChanged)
+    Q_PROPERTY(int manualModeChannelIndex   READ manualModeChannelIndex     WRITE setManualModeChannelIndex     NOTIFY manualModeChannelIndexChanged)
+    Q_PROPERTY(int assistModeChannelIndex   READ assistModeChannelIndex                                         NOTIFY assistModeChannelIndexChanged)
+    Q_PROPERTY(int autoModeChannelIndex     READ autoModeChannelIndex                                           NOTIFY autoModeChannelIndexChanged)
+    Q_PROPERTY(int acroModeChannelIndex     READ acroModeChannelIndex       WRITE setAcroModeChannelIndex       NOTIFY acroModeChannelIndexChanged)
+    Q_PROPERTY(int altCtlModeChannelIndex   READ altCtlModeChannelIndex                                         NOTIFY altCtlModeChannelIndexChanged)
+    Q_PROPERTY(int posCtlModeChannelIndex   READ posCtlModeChannelIndex     WRITE setPosCtlModeChannelIndex     NOTIFY posCtlModeChannelIndexChanged)
+    Q_PROPERTY(int loiterModeChannelIndex   READ loiterModeChannelIndex     WRITE setLoiterModeChannelIndex     NOTIFY loiterModeChannelIndexChanged)
+    Q_PROPERTY(int missionModeChannelIndex  READ missionModeChannelIndex                                        NOTIFY missionModeChannelIndexChanged)
+    Q_PROPERTY(int returnModeChannelIndex   READ returnModeChannelIndex     WRITE setReturnModeChannelIndex     NOTIFY returnModeChannelIndexChanged)
+    Q_PROPERTY(int offboardModeChannelIndex READ offboardModeChannelIndex   WRITE setOffboardModeChannelIndex   NOTIFY offboardModeChannelIndexChanged)
     
-    double modeSwitchLiveRange(void);
+    Q_PROPERTY(double manualModeRcValue     READ manualModeRcValue      NOTIFY switchLiveRangeChanged)
-    double loiterSwitchLiveRange(void);
+    Q_PROPERTY(double assistModeRcValue     READ assistModeRcValue      NOTIFY switchLiveRangeChanged)
-    double posCtlSwitchLiveRange(void);
+    Q_PROPERTY(double autoModeRcValue       READ autoModeRcValue        NOTIFY switchLiveRangeChanged)
-    double returnSwitchLiveRange(void);
+    Q_PROPERTY(double acroModeRcValue       READ acroModeRcValue        NOTIFY switchLiveRangeChanged)
-    double offboardSwitchLiveRange(void);
+    Q_PROPERTY(double altCtlModeRcValue     READ altCtlModeRcValue      NOTIFY switchLiveRangeChanged)
-    double acroSwitchLiveRange(void);
+    Q_PROPERTY(double posCtlModeRcValue     READ posCtlModeRcValue      NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(double loiterModeRcValue     READ loiterModeRcValue      NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(double missionModeRcValue    READ missionModeRcValue     NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(double returnModeRcValue     READ returnModeRcValue      NOTIFY switchLiveRangeChanged)
+    Q_PROPERTY(double offboardModeRcValue   READ offboardModeRcValue    NOTIFY switchLiveRangeChanged)
     
-    bool sendLiveRCSwitchRanges(void) { return _liveRCValues; }
+    Q_PROPERTY(double manualModeThreshold   READ manualModeThreshold                                    NOTIFY thresholdsChanged)
-    void setSendLiveRCSwitchRanges(bool start);
+    Q_PROPERTY(double assistModeThreshold   READ assistModeThreshold    WRITE setAssistModeThreshold    NOTIFY thresholdsChanged)
+    Q_PROPERTY(double autoModeThreshold     READ autoModeThreshold      WRITE setAutoModeThreshold      NOTIFY thresholdsChanged)
+    Q_PROPERTY(double acroModeThreshold     READ acroModeThreshold      WRITE setAcroModeThreshold      NOTIFY thresholdsChanged)
+    Q_PROPERTY(double altCtlModeThreshold   READ altCtlModeThreshold    WRITE setAltCtlModeThreshold    NOTIFY thresholdsChanged)
+    Q_PROPERTY(double posCtlModeThreshold   READ posCtlModeThreshold    WRITE setPosCtlModeThreshold    NOTIFY thresholdsChanged)
+    Q_PROPERTY(double loiterModeThreshold   READ loiterModeThreshold    WRITE setLoiterModeThreshold    NOTIFY thresholdsChanged)
+    Q_PROPERTY(double missionModeThreshold  READ missionModeThreshold   WRITE setMissionModeThreshold   NOTIFY thresholdsChanged)
+    Q_PROPERTY(double returnModeThreshold   READ returnModeThreshold    WRITE setReturnModeThreshold    NOTIFY thresholdsChanged)
+    Q_PROPERTY(double offboardModeThreshold READ offboardModeThreshold  WRITE setOffboardModeThreshold  NOTIFY thresholdsChanged)
+    
+    Q_PROPERTY(bool assistModeVisible   MEMBER _assistModeVisible   NOTIFY modesVisibleChanged)
+    Q_PROPERTY(bool autoModeVisible     MEMBER _autoModeVisible     NOTIFY modesVisibleChanged)
+    
+    Q_PROPERTY(bool manualModeSelected      MEMBER _manualModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool assistModeSelected      MEMBER _assistModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool autoModeSelected        MEMBER _autoModeSelected        NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool acroModeSelected        MEMBER _acroModeSelected        NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool altCtlModeSelected      MEMBER _altCtlModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool posCtlModeSelected      MEMBER _posCtlModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool missionModeSelected     MEMBER _missionModeSelected     NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool loiterModeSelected      MEMBER _loiterModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool returnModeSelected      MEMBER _returnModeSelected      NOTIFY modesSelectedChanged)
+    Q_PROPERTY(bool offboardModeSelected    MEMBER _offboardModeSelected    NOTIFY modesSelectedChanged)
+    
+    Q_PROPERTY(QStringList channelListModel MEMBER _channelListModel CONSTANT)
+    
+    Q_INVOKABLE void generateThresholds(void);
+    
+    int assistModeRow(void);
+    int autoModeRow(void);
+    int acroModeRow(void);
+    int altCtlModeRow(void);
+    int posCtlModeRow(void);
+    int loiterModeRow(void);
+    int missionModeRow(void);
+    int returnModeRow(void);
+    int offboardModeRow(void);
+    
+    int manualModeChannelIndex(void);
+    int assistModeChannelIndex(void);
+    int autoModeChannelIndex(void);
+    int acroModeChannelIndex(void);
+    int altCtlModeChannelIndex(void);
+    int posCtlModeChannelIndex(void);
+    int loiterModeChannelIndex(void);
+    int missionModeChannelIndex(void);
+    int returnModeChannelIndex(void);
+    int offboardModeChannelIndex(void);
+    
+    void setManualModeChannelIndex(int index);
+    void setAcroModeChannelIndex(int index);
+    void setPosCtlModeChannelIndex(int index);
+    void setLoiterModeChannelIndex(int index);
+    void setReturnModeChannelIndex(int index);
+    void setOffboardModeChannelIndex(int index);
+    
+    double manualModeRcValue(void);
+    double assistModeRcValue(void);
+    double autoModeRcValue(void);
+    double acroModeRcValue(void);
+    double altCtlModeRcValue(void);
+    double posCtlModeRcValue(void);
+    double missionModeRcValue(void);
+    double loiterModeRcValue(void);
+    double returnModeRcValue(void);
+    double offboardModeRcValue(void);
+    
+    double manualModeThreshold(void);
+    double assistModeThreshold(void);
+    double autoModeThreshold(void);
+    double acroModeThreshold(void);
+    double altCtlModeThreshold(void);
+    double posCtlModeThreshold(void);
+    double missionModeThreshold(void);
+    double loiterModeThreshold(void);
+    double returnModeThreshold(void);
+    double offboardModeThreshold(void);
+    
+    void setAssistModeThreshold(double threshold);
+    void setAutoModeThreshold(double threshold);
+    void setAcroModeThreshold(double threshold);
+    void setAltCtlModeThreshold(double threshold);
+    void setPosCtlModeThreshold(double threshold);
+    void setMissionModeThreshold(double threshold);
+    void setLoiterModeThreshold(double threshold);
+    void setReturnModeThreshold(double threshold);
+    void setOffboardModeThreshold(double threshold);
     
 signals:
     void switchLiveRangeChanged(void);
-    void liveRCSwitchRangesChanged(void);
+    void thresholdsChanged(void);
+    void modesSelectedChanged(void);
+    void modesVisibleChanged(void);
+    void manualModeChannelIndexChanged(int index);
+    void assistModeChannelIndexChanged(int index);
+    void autoModeChannelIndexChanged(int index);
+    void acroModeChannelIndexChanged(int index);
+    void altCtlModeChannelIndexChanged(int index);
+    void posCtlModeChannelIndexChanged(int index);
+    void loiterModeChannelIndexChanged(int index);
+    void missionModeChannelIndexChanged(int index);
+    void returnModeChannelIndexChanged(int index);
+    void offboardModeChannelIndexChanged(int index);
+    void modeRowsChanged(void);
     
 private slots:
     void _remoteControlChannelRawChanged(int chan, float fval);
     
 private:
     double _switchLiveRange(const QString& param);
-    void _initRcValues(void);
+    void _init(void);
     void _validateConfiguration(void);
+    void _recalcModeSelections(void);
+    void _recalcModeRows(void);
+    int _channelToChannelIndex(int channel);
+    int _channelToChannelIndex(const QString& channelParam);
+    int _channelIndexToChannel(int index);
     
     static const int _chanMax = 18;
     
-    QList<double>   _rcValues;
+    bool _fixedWing;
-    bool            _liveRCValues;
+    
-    int             _rgRCMin[_chanMax];
+    double  _rcValues[_chanMax];
-    int             _rgRCMax[_chanMax];
+    int     _rgRCMin[_chanMax];
-    bool            _rgRCReversed[_chanMax];
+    int     _rgRCMax[_chanMax];
+    bool    _rgRCReversed[_chanMax];
     
     bool    _validConfiguration;
     QString _configurationErrors;
     int     _channelCount;
+
+    int _assistModeRow;
+    int _autoModeRow;
+    int _acroModeRow;
+    int _altCtlModeRow;
+    int _posCtlModeRow;
+    int _loiterModeRow;
+    int _missionModeRow;
+    int _returnModeRow;
+    int _offboardModeRow;
+    
+    bool _manualModeSelected;
+    bool _assistModeSelected;
+    bool _autoModeSelected;
+    bool _acroModeSelected;
+    bool _altCtlModeSelected;
+    bool _posCtlModeSelected;
+    bool _missionModeSelected;
+    bool _loiterModeSelected;
+    bool _returnModeSelected;
+    bool _offboardModeSelected;
+    
+    bool _assistModeVisible;
+    bool _autoModeVisible;
+    
+    QStringList _channelListModel;
+    QList<int>  _channelListModelChannel;
 };
 
 #endif

src/QmlControls/ModeSwitchDisplay.qml

@@ -0,0 +1,196 @@
+/*=====================================================================
+
+ QGroundControl Open Source Ground Control Station
+
+ (c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+ This file is part of the QGROUNDCONTROL project
+
+ QGROUNDCONTROL is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ QGROUNDCONTROL is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+ ======================================================================*/
+
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+import QGroundControl.Palette 1.0
+import QGroundControl.ScreenTools 1.0
+
+Rectangle {
+    property string flightModeName          ///< User visible name for this  flight mode
+    property string flightModeDescription
+    property real   rcValue                 ///< Current rcValue to show in Monitor display, range: 0.0 - 1.0
+    property int    modeChannelIndex        ///< Index into channel list for this mode
+    property bool   modeChannelEnabled      ///< true: Channel combo box is enabled
+    property bool   modeSelected            ///< true: This mode is currently selected
+    property real   thresholdValue          ///< Treshold setting for this mode, show in Threshold display, range 0.0 - 1.0
+    property bool   thresholdDragEnabled    ///< true: Threshold value indicator can be dragged to modify value
+
+    anchors.leftMargin:     ScreenTools.defaultFontPixelWidth
+    anchors.rightMargin:    ScreenTools.defaultFontPixelWidth
+    anchors.left:           parent.left
+    anchors.right:          parent.right
+    height:                 column.height + (ScreenTools.defaultFontPixelWidth * 2)
+    color:                  _qgcPal.windowShade
+
+    QGCPalette { id: _qgcPal; colorGroupEnabled: enabled }
+
+    Item {
+        anchors.margins:    ScreenTools.defaultFontPixelWidth
+        anchors.fill:       parent
+
+        Column {
+            id:         column
+            width:      parent.width
+            spacing:    ScreenTools.defaultFontPixelHeight / 4
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth
+
+                Rectangle {
+                    width:  modeLabel.width
+                    height: modeLabel.contentHeight
+                    color:  modeSelected ? _qgcPal.buttonHighlight : _qgcPal.windowShade
+
+                    QGCLabel {
+                        id:                     modeLabel
+                        width:                  ScreenTools.defaultFontPixelWidth * 18
+                        color:                  modeSelected ? _qgcPal.buttonHighlightText : _qgcPal.text
+                        horizontalAlignment:    Text.AlignHCenter
+                        font.pixelSize:         ScreenTools.mediumFontPixelSize
+                        text:                   flightModeName
+                    }
+                }
+
+                QGCComboBox {
+                    id:             channelCombo
+                    width:          ScreenTools.defaultFontPixelWidth * 15
+                    model:          controller.channelListModel
+                    currentIndex:   modeChannelIndex
+                    enabled:        modeChannelEnabled
+
+                    onActivated: modeChannelIndex = index
+                }
+
+                QGCLabel {
+                    width:      parent.width - x
+                    wrapMode:   Text.WordWrap
+                    text:       flightModeDescription
+                }
+            }
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth * 2
+
+                QGCLabel {
+                    width:              ScreenTools.defaultFontPixelWidth * monitorThresholdCharWidth
+                    height:             ScreenTools.defaultFontPixelHeight
+                    verticalAlignment:  Text.AlignVCenter
+                    text:               "Monitor:"
+                }
+
+                Item {
+                    height: ScreenTools.defaultFontPixelHeight
+                    width:  parent.width - x
+
+                    // Won't be able to pull these properties, need to reference parent.
+                    property int            __lastRcValue:      1500
+                    readonly property int   __rcValueMaxJitter: 2
+
+                    // Bar
+                    Rectangle {
+                        id:                     bar
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.width
+                        height:                 parent.height / 2
+                        color:                  _qgcPal.windowShadeDark
+                    }
+
+                    // RC Indicator
+                    Rectangle {
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.height * 0.75
+                        height:                 width
+                        x:                      (parent.width * rcValue) - (width / 2)
+                        radius:                 width / 2
+                        color:                  _qgcPal.text
+                    }
+                } // Item
+            }
+
+            Row {
+                width:      parent.width
+                spacing:    ScreenTools.defaultFontPixelWidth * 2
+
+                QGCLabel {
+                    width:              ScreenTools.defaultFontPixelWidth * monitorThresholdCharWidth
+                    height:             ScreenTools.defaultFontPixelHeight
+                    verticalAlignment:  Text.AlignVCenter
+                    text:               "Threshold:"
+                }
+
+
+                Item {
+                    id:     thresholdContainer
+                    height: ScreenTools.defaultFontPixelHeight
+                    width:  parent.width - x
+
+                    // Bar
+                    Rectangle {
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.width
+                        height:                 parent.height / 2
+                        color:                  _qgcPal.windowShadeDark
+                    }
+
+                    // Threshold Indicator
+                    Rectangle {
+                        id:                     thresholdIndicator
+                        anchors.verticalCenter: parent.verticalCenter
+                        width:                  parent.height * 0.75
+                        height:                 width
+                        x:                      (parent.width * thresholdValue) - (width / 2)
+                        radius:                 width / 2
+                        color:                  thresholdDragEnabled ? _qgcPal.buttonHighlight : _qgcPal.text
+
+                        Drag.active:    thresholdDrag.drag.active
+                        Drag.hotSpot.x: width / 2
+                        Drag.hotSpot.y: height / 2
+
+                        MouseArea {
+                            id:             thresholdDrag
+                            anchors.fill:   parent
+                            cursorShape:    Qt.SizeHorCursor
+                            drag.target:    thresholdDragEnabled ? parent : null
+                            drag.minimumX:  - (width / 2)
+                            drag.maximumX:  thresholdContainer.width - (width / 2)
+                            drag.axis:      Drag.XAxis
+
+                            property bool dragActive: drag.active
+
+                            onDragActiveChanged: {
+                                if (!drag.active) {
+                                    thresholdValue = (thresholdIndicator.x + (thresholdIndicator.width / 2)) / thresholdContainer.width
+                                }
+                            }
+                        }
+                    }
+                } // Item
+            } // Row
+        } // Column
+    } // Item
+} // Rectangle

src/QmlControls/QGroundControl.Controls.qmldir

@@ -19,6 +19,8 @@ ViewWidget 1.0 ViewWidget.qml
 ParameterEditor 1.0 ParameterEditor.qml
 ParameterEditorDialog 1.0 ParameterEditorDialog.qml
 
+ModeSwitchDisplay 1.0 ModeSwitchDisplay.qml
+
 QGCView 1.0 QGCView.qml
 QGCViewPanel 1.0 QGCViewPanel.qml
 QGCViewDialog 1.0 QGCViewDialog.qml