From 4550981f11da7c5ed8facd6ca5a15d7bf97f0e73 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Tue, 31 May 2016 13:45:41 -0400
Subject: [PATCH] Better handle disabling AP channel number for WiFi
parameters.
---
src/AutoPilotPlugins/Common/ESP8266Component.qml | 2 +-
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml
index 864ee1d..dc43951 100644
--- a/src/AutoPilotPlugins/Common/ESP8266Component.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml
@@ -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: {
diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
index 5165384..3720a1e 100644
--- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
@@ -38,8 +38,9 @@ FactPanel {
valueText: wifiMode ? (wifiMode.value === 0 ? "AP Mode" : "Station Mode") : "AP Mode"
}
VehicleSummaryRow {
- labelText: qsTr("WiFi Channel:")
- valueText: wifiChannel ? wifiChannel.valueString : ""
+ labelText: qsTr("WiFi Channel:")
+ valueText: wifiChannel ? wifiChannel.valueString : ""
+ visible: wifiMode ? wifiMode.value === 0 : true
}
VehicleSummaryRow {
labelText: qsTr("WiFi AP SSID:")