From 82e8b33b706988aef56accef979dd82299c19d8b Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sun, 20 Dec 2015 10:26:02 -0800
Subject: [PATCH] Handle missing channel options

---
 src/AutoPilotPlugins/APM/APMFlightModesComponent.qml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
index 9fbeeab7b..34c76beca 100644
--- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
@@ -36,6 +36,7 @@ QGCView {
     viewPanel:  panel
 
     property real _margins: ScreenTools.defaultFontPixelHeight
+    property bool _channelOptionsAvailable: controller.parameterExists(-1, "CH7_OPT")   // Not available in all firmware types
 
     QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
 
@@ -116,6 +117,7 @@ QGCView {
                 anchors.left:       flightModeSettings.right
                 text:               "Channel Options"
                 font.weight:        Font.DemiBold
+                visible:            _channelOptionsAvailable
             }
 
             Rectangle {
@@ -126,6 +128,7 @@ QGCView {
                 width:              channelOptColumn.width + (_margins * 2)
                 height:             channelOptColumn.height + ScreenTools.defaultFontPixelHeight
                 color:              qgcPal.windowShade
+                visible:            _channelOptionsAvailable
 
                 Column {
                     id:                 channelOptColumn
@@ -141,19 +144,18 @@ QGCView {
                             spacing: ScreenTools.defaultFontPixelWidth
 
                             property int index: modelData + 7
+                            property Fact nullFact: Fact { }
 
                             QGCLabel {
                                 anchors.baseline:   optCombo.baseline
                                 text:               "Channel option " + index + ":"
                                 color:              controller.channelOptionEnabled[modelData] ? qgcPal.buttonHighlight : qgcPal.text
-
-                                Component.onCompleted: console.log(index, controller.channelOptionEnabled[modelData])
                             }
 
                             FactComboBox {
                                 id:         optCombo
                                 width:      ScreenTools.defaultFontPixelWidth * 15
-                                fact:       controller.getParameterFact(-1, "CH" + index + "_OPT")
+                                fact:       _channelOptionsAvailable ? controller.getParameterFact(-1, "CH" + index + "_OPT") : nullFact
                                 indexModel: false
                             }
                         }
-- 
2.22.0