Skip to content

Q
qgroundcontrol
Commit 3b8053ab authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

PX4 Safety config: Make auto disarm more obvious

parent 11895fd5
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 10 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 3b8053ab
...@@ -54,6 +54,7 @@ QGCView { ...@@ -54,6 +54,7 @@ QGCView {
property Fact _lowBattAction: controller.getParameterFact(-1, "COM_LOW_BAT_ACT") property Fact _lowBattAction: controller.getParameterFact(-1, "COM_LOW_BAT_ACT")
property Fact _rcLossAction: controller.getParameterFact(-1, "NAV_RCL_ACT") property Fact _rcLossAction: controller.getParameterFact(-1, "NAV_RCL_ACT")
property Fact _dlLossAction: controller.getParameterFact(-1, "NAV_DLL_ACT") property Fact _dlLossAction: controller.getParameterFact(-1, "NAV_DLL_ACT")
property Fact _disarmLandDelay: controller.getParameterFact(-1, "COM_DISARM_LAND")
QGCViewPanel { QGCViewPanel {
id: panel id: panel
...@@ -72,7 +73,7 @@ QGCView { ...@@ -72,7 +73,7 @@ QGCView {
*/ */
Item { width: 1; height: _margins * 0.5; } Item { width: 1; height: _margins * 0.5; }
QGCLabel { QGCLabel {
text: qsTr("Low Battery Trigger") text: qsTr("Low Battery Failsafe Trigger")
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
...@@ -101,7 +102,7 @@ QGCView { ...@@ -101,7 +102,7 @@ QGCView {
QGCLabel { QGCLabel {
anchors.baseline: lowBattCombo.baseline anchors.baseline: lowBattCombo.baseline
width: _middleRowWidth width: _middleRowWidth
text: qsTr("Action:") text: qsTr("Failsafe Action:")
} }
FactComboBox { FactComboBox {
id: lowBattCombo id: lowBattCombo
...@@ -143,7 +144,7 @@ QGCView { ...@@ -143,7 +144,7 @@ QGCView {
**** RC Loss **** **** RC Loss ****
*/ */
QGCLabel { QGCLabel {
text: qsTr("RC Loss Trigger") text: qsTr("RC Loss Failsafe Trigger")
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
...@@ -171,7 +172,7 @@ QGCView { ...@@ -171,7 +172,7 @@ QGCView {
QGCLabel { QGCLabel {
anchors.baseline: rcLossCombo.baseline anchors.baseline: rcLossCombo.baseline
width: _middleRowWidth width: _middleRowWidth
text: qsTr("Action:") text: qsTr("Failsafe Action:")
} }
FactComboBox { FactComboBox {
id: rcLossCombo id: rcLossCombo
...@@ -200,7 +201,7 @@ QGCView { ...@@ -200,7 +201,7 @@ QGCView {
**** Data Link Loss **** **** Data Link Loss ****
*/ */
QGCLabel { QGCLabel {
text: qsTr("Data Link Loss Trigger") text: qsTr("Data Link Loss Failsafe Trigger")
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
...@@ -228,7 +229,7 @@ QGCView { ...@@ -228,7 +229,7 @@ QGCView {
QGCLabel { QGCLabel {
anchors.baseline: dlLossCombo.baseline anchors.baseline: dlLossCombo.baseline
width: _middleRowWidth width: _middleRowWidth
text: qsTr("Action:") text: qsTr("Failsafe Action:")
} }
FactComboBox { FactComboBox {
id: dlLossCombo id: dlLossCombo
...@@ -257,7 +258,7 @@ QGCView { ...@@ -257,7 +258,7 @@ QGCView {
**** Geofence **** **** Geofence ****
*/ */
QGCLabel { QGCLabel {
text: qsTr("Geofence Trigger") text: qsTr("Geofence Failsafe Trigger")
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }
Rectangle { Rectangle {
...@@ -496,15 +497,19 @@ QGCView { ...@@ -496,15 +497,19 @@ QGCView {
} }
} }
Row { Row {
QGCLabel { QGCCheckBox {
id: disarmDelayCheckBox
anchors.baseline: disarmField.baseline anchors.baseline: disarmField.baseline
width: _middleRowWidth
text: qsTr("Disarm After:") text: qsTr("Disarm After:")
checked: _disarmLandDelay.value > 0
onClicked: _disarmLandDelay.value = checked ? 2 : 0
width: _middleRowWidth
} }
FactTextField { FactTextField {
id: disarmField id: disarmField
fact: controller.getParameterFact(-1, "COM_DISARM_LAND")
showUnits: true showUnits: true
fact: _disarmLandDelay
enabled: disarmDelayCheckBox.checked
width: _editFieldWidth width: _editFieldWidth
} }
} }
......
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