Skip to content

Q
qgroundcontrol
Commit c29de21a authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Merge pull request #3454 from dogmaphobic/wifiMode 

Better handle disabling AP channel number for WiFi parameters.
parents a8fda9bc 4550981f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/AutoPilotPlugins/Common/ESP8266Component.qml
View file @ c29de21a
...@@ -168,7 +168,7 @@ QGCView { ...@@ -168,7 +168,7 @@ QGCView {
QGCComboBox { QGCComboBox {
id: channelField id: channelField
width: _editFieldWidth width: _editFieldWidth
enabled: wifiMode && wifiMode.value === 0 enabled: wifiMode ? wifiMode.value === 0 : true
model: controller.wifiChannels model: controller.wifiChannels
currentIndex: wifiChannel ? wifiChannel.value - 1 : 0 currentIndex: wifiChannel ? wifiChannel.value - 1 : 0
onActivated: { onActivated: {
......
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
View file @ c29de21a
...@@ -38,8 +38,9 @@ FactPanel { ...@@ -38,8 +38,9 @@ FactPanel {
valueText: wifiMode ? (wifiMode.value === 0 ? "AP Mode" : "Station Mode") : "AP Mode" valueText: wifiMode ? (wifiMode.value === 0 ? "AP Mode" : "Station Mode") : "AP Mode"
} }
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("WiFi Channel:") labelText: qsTr("WiFi Channel:")
valueText: wifiChannel ? wifiChannel.valueString : "" valueText: wifiChannel ? wifiChannel.valueString : ""
visible: wifiMode ? wifiMode.value === 0 : true
} }
VehicleSummaryRow { VehicleSummaryRow {
labelText: qsTr("WiFi AP SSID:") labelText: qsTr("WiFi AP SSID:")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment