Commit dc3e21f8 authored by Don Gagne's avatar Don Gagne

Add Arming Checks to Safety

parent f488f6b0
...@@ -58,6 +58,8 @@ QGCView { ...@@ -58,6 +58,8 @@ QGCView {
property Fact _rtlLoitTimeFact: controller.getParameterFact(-1, "RTL_LOIT_TIME") property Fact _rtlLoitTimeFact: controller.getParameterFact(-1, "RTL_LOIT_TIME")
property Fact _rtlAltFinalFact: controller.getParameterFact(-1, "RTL_ALT_FINAL") property Fact _rtlAltFinalFact: controller.getParameterFact(-1, "RTL_ALT_FINAL")
property Fact _armingCheck: controller.getParameterFact(-1, "ARMING_CHECK")
property real _margins: ScreenTools.defaultFontPixelHeight property real _margins: ScreenTools.defaultFontPixelHeight
ExclusiveGroup { id: fenceActionRadioGroup } ExclusiveGroup { id: fenceActionRadioGroup }
...@@ -71,9 +73,8 @@ QGCView { ...@@ -71,9 +73,8 @@ QGCView {
Flickable { Flickable {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
boundsBehavior: Flickable.StopAtBounds contentHeight: armingCheckSettings.y + armingCheckSettings.height
contentHeight: rtlSettings.y + rtlSettings.height contentWidth: armingCheckSettings.x + armingCheckSettings.width
flickableDirection: Flickable.VerticalFlick
QGCLabel { QGCLabel {
id: failsafeLabel id: failsafeLabel
...@@ -447,6 +448,33 @@ QGCView { ...@@ -447,6 +448,33 @@ QGCView {
showUnits: true showUnits: true
} }
} // Rectangle - RTL Settings } // Rectangle - RTL Settings
QGCLabel {
id: armingCheckLabel
anchors.topMargin: _margins
anchors.left: parent.left
anchors.top: rtlSettings.bottom
text: "Arming Checks"
font.weight: Font.DemiBold
}
Rectangle {
id: armingCheckSettings
anchors.topMargin: _margins / 2
anchors.left: parent.left
anchors.top: armingCheckLabel.bottom
width: armingCheckColumn.x + armingCheckColumn.width + _margins
height: armingCheckColumn.y + armingCheckColumn.height + _margins
color: palette.windowShade
Column {
id: armingCheckColumn
spacing: _margins
QGCLabel { text: "Be very careful when turning off arming checks. Could lead to loss of Vehicle control." }
FactBitmask { fact: _armingCheck }
}
}
} // Flickable } // Flickable
} // QGCViewPanel } // QGCViewPanel
} // QGCView } // QGCView
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