Skip to content

Q
qgroundcontrol
Commit 27db20a4 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Fix flight mode switch setting

parent cbe81ce1
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 63 deletions
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
View file @ 27db20a4
......@@ -7,9 +7,9 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
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,49 +65,48 @@ 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 {
spacing: _margins
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
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false
Layout.preferredWidth: _channelComboWidth
fact: controller.getParameterFact(-1, "RC_MAP_FLTMODE")
indexModel: false
}
}
Repeater {
model: 6
Row {
spacing: ScreenTools.defaultFontPixelWidth
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
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false
Layout.preferredWidth: _channelComboWidth
fact: controller.getParameterFact(-1, "COM_FLTMODE" + index)
indexModel: false
}
}
} // Repeater - Flight Modes
......@@ -126,74 +125,87 @@ 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 {
spacing: ScreenTools.defaultFontPixelWidth
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" ]
property Fact fact: controller.getParameterFact(-1, "RC_MAP_RETURN_SW")
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
Layout.fillWidth: true
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)
}
property Fact fact: controller.getParameterFact(-1, modelData)
FactComboBox {
id: returnCombo
width: _channelComboWidth
fact: parent.fact
indexModel: false
QGCLabel {
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
Repeater {
model: [ "RC_MAP_FLAPS", "RC_MAP_MAN_SW" ]
property Fact fact: controller.getParameterFact(-1, "RC_MAP_KILL_SW")
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
visible: controller.vehicle.fixedWing
Layout.fillWidth: true
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)
}
property Fact fact: controller.getParameterFact(-1, modelData)
FactComboBox {
id: killCombo
width: _channelComboWidth
fact: parent.fact
indexModel: false
QGCLabel {
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
Repeater {
model: [ "RC_MAP_TRANS_SW" ]
property Fact fact: controller.getParameterFact(-1, "RC_MAP_OFFB_SW")
RowLayout {
spacing: ScreenTools.defaultFontPixelWidth
Layout.fillWidth: true
visible: controller.vehicle.vtol
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)
}
property Fact fact: controller.getParameterFact(-1, modelData)
FactComboBox {
id: offboardCombo
width: _channelComboWidth
fact: parent.fact
indexModel: false
QGCLabel {
text: fact.shortDescription
Layout.fillWidth: true
}
FactComboBox {
Layout.preferredWidth: _channelComboWidth
fact: parent.fact
indexModel: false
}
}
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
......
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