Skip to content

Q
qgroundcontrol
Commit b314f617 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4354 from DonLakeFlyer/UAVCan 

Correct UAVCAN settings
parents 944d7224 c7314f6d
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ b314f617
...@@ -398,7 +398,7 @@ SetupPage { ...@@ -398,7 +398,7 @@ SetupPage {
QGCCheckBox { QGCCheckBox {
id: showUAVCAN id: showUAVCAN
text: qsTr("Show UAVCAN Settings") text: qsTr("Show UAVCAN Settings")
visible: uavcanEnable !== -1 checked: uavcanEnable.rawValue != 0
} }
QGCLabel { QGCLabel {
...@@ -409,24 +409,27 @@ SetupPage { ...@@ -409,24 +409,27 @@ SetupPage {
Rectangle { Rectangle {
width: parent.width width: parent.width
height: uavCanConfigColumn.height + ScreenTools.defaultFontPixelHeight height: uavCanConfigRow.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade color: qgcPal.windowShade
visible: showUAVCAN.checked visible: showUAVCAN.checked
Column { Row {
id: uavCanConfigColumn id: uavCanConfigRow
anchors.margins: ScreenTools.defaultFontPixelHeight / 2 anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
FactCheckBox { FactComboBox {
id: uavcanEnabledCheckBox id: uavcanEnabledCheckBox
width: ScreenTools.defaultFontPixelWidth * 20 width: ScreenTools.defaultFontPixelWidth * 20
fact: uavcanEnable fact: uavcanEnable
checkedValue: 3 indexModel: false
uncheckedValue: 0 }
text: qsTr("Enable UAVCAN as the default MAIN output bus (requires autopilot restart)")
QGCLabel {
anchors.verticalCenter: parent.verticalCenter
text: qsTr("Change required restart")
} }
} }
} }
......
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