Merge pull request #3454 from dogmaphobic/wifiMode

Better handle disabling AP channel number for WiFi parameters.
9 years ago · c29de21aa5
2 changed files with 4 additions and 3 deletions
--- a/src/AutoPilotPlugins/Common/ESP8266Component.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml
@ -168,7 +168,7 @@ QGCView {
				@@ -168,7 +168,7 @@ QGCView {
                                QGCComboBox {
                                    id:                     channelField
                                    width:                  _editFieldWidth
-                                    enabled:                wifiMode && wifiMode.value === 0
+                                    enabled:                wifiMode ? wifiMode.value === 0 : true
                                    model:                  controller.wifiChannels
                                    currentIndex:           wifiChannel ? wifiChannel.value - 1 : 0
                                    onActivated: {
--- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
@ -40,6 +40,7 @@ FactPanel {
				@@ -40,6 +40,7 @@ FactPanel {
        VehicleSummaryRow {
            labelText:  qsTr("WiFi Channel:")
            valueText:  wifiChannel ? wifiChannel.valueString : ""
+            visible:    wifiMode ? wifiMode.value === 0 : true
        }
        VehicleSummaryRow {
            labelText: qsTr("WiFi AP SSID:")