Skip to content
Snippets Groups Projects
Commit 27db20a4 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files

Fix flight mode switch setting

parent cbe81ce1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
+ 75
− 63
View file @ 27db20a4
......@@ -7,9 +7,9 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
......@@ -65,25 +65,24 @@ Item {
height: flightModeColumn.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
Column {
ColumnLayout {
id: flightModeColumn
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
Row {
RowLayout {
Layout.fillWidth: true
spacing: _margins
QGCLabel {
id: modeChannelLabel
anchors.baseline: modeChannelCombo.baseline
Layout.fillWidth: true
text: qsTr("Mode channel:")
}
FactComboBox {
id: modeChannelCombo
width: _channelComboWidth
Layout.preferredWidth: _channelComboWidth
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false
}
......@@ -92,20 +91,20 @@ Item {
Repeater {
model: 6
Row {
RowLayout {
Layout.fillWidth: true
spacing: ScreenTools.defaultFontPixelWidth
property int index: modelData + 1
QGCLabel {
anchors.baseline: modeCombo.baseline
Layout.fillWidth: true
text: qsTr("Flight Mode %1").arg(index)
color: controller.activeFlightMode == index ? "yellow" : qgcPal.text
}
FactComboBox {
id: modeCombo
width: _flightModeComboWidth
Layout.preferredWidth: _channelComboWidth
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false
}
......@@ -126,73 +125,86 @@ Item {
Rectangle {
id: switchSettingsRect
width: switchSettingsColumn.width + (_margins * 2)
height: switchSettingsColumn.height + ScreenTools.defaultFontPixelHeight
width: switchSettingsGrid.width + (_margins * 2)
height: switchSettingsGrid.height + ScreenTools.defaultFontPixelHeight
color: qgcPal.windowShade
Column {
id: switchSettingsColumn
GridLayout {
id: switchSettingsGrid
anchors.margins: ScreenTools.defaultFontPixelWidth
anchors.left: parent.left
anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight
columns: 2
columnSpacing: ScreenTools.defaultFontPixelWidth
Row {
Repeater {
model: [ "RC_MAP_ACRO_SW", "RC_MAP_ARM_SW", "RC_MAP_GEAR_SW", "RC_MAP_KILL_SW", "RC_MAP_LOITER_SW", "RC_MAP_OFFB_SW", "RC_MAP_POSCTL_SW", "RC_MAP_RATT_SW", "RC_MAP_RETURN_SW", "RC_MAP_STAB_SW" ]
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
Layout.fillWidth: true
property Fact fact: controller.getParameterFact(-1, "RC_MAP_RETURN_SW")
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel {
anchors.baseline: returnCombo.baseline
text: qsTr("Return switch:")
color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
id: returnCombo
width: _channelComboWidth
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
Repeater {
model: [ "RC_MAP_FLAPS", "RC_MAP_MAN_SW" ]
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
visible: controller.vehicle.fixedWing
Layout.fillWidth: true
property Fact fact: controller.getParameterFact(-1, "RC_MAP_KILL_SW")
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel {
anchors.baseline: killCombo.baseline
text: qsTr("Kill switch:")
color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
id: killCombo
width: _channelComboWidth
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
Repeater {
model: [ "RC_MAP_TRANS_SW" ]
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
Layout.fillWidth: true
visible: controller.vehicle.vtol
property Fact fact: controller.getParameterFact(-1, "RC_MAP_OFFB_SW")
property Fact fact: controller.getParameterFact(-1, modelData)
QGCLabel {
anchors.baseline: offboardCombo.baseline
text: qsTr("Offboard switch:")
color: parent.fact.value === 0 ? qgcPal.text : (controller.rcChannelValues[parent.fact.value - 1] >= 1500 ? "yellow" : qgcPal.text)
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
id: offboardCombo
width: _channelComboWidth
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
......
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