Browse Source

Merge pull request #3454 from dogmaphobic/wifiMode

Better handle disabling AP channel number for WiFi parameters.
QGC4.4
Gus Grubba 9 years ago
parent
commit
c29de21aa5
  1. 2
      src/AutoPilotPlugins/Common/ESP8266Component.qml
  2. 5
      src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml

2
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: {

5
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml

@ -38,8 +38,9 @@ FactPanel { @@ -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:")

Loading…
Cancel
Save