zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

APMSafetyComponentSub.qml: warn user if params are unavailable due to improper power module setup

QGC4.4
Willian Galvani 3 years ago committed by Patrick José Pereira
parent
550b6c3cfa
commit
498735b04d
1 changed files with 13 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml

16
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
Unescape View File

@ -38,7 +38,7 @@ SetupPage { @@ -38,7 +38,7 @@ SetupPage {
property bool _firmware34: globals.activeVehicle.versionCompare(3, 5, 0) < 0
// Enable/Action parameters
property Fact _failsafeBatteryEnable: controller.getParameterFact(-1, "r.BATT_FS_LOW_ACT")
property Fact _failsafeBatteryEnable: controller.getParameterFact(-1, "r.BATT_FS_LOW_ACT", false)
property Fact _failsafeEKFEnable: controller.getParameterFact(-1, "FS_EKF_ACTION")
property Fact _failsafeGCSEnable: controller.getParameterFact(-1, "FS_GCS_ENABLE")
property Fact _failsafeLeakEnable: controller.getParameterFact(-1, "FS_LEAK_ENABLE")
@ -53,8 +53,9 @@ SetupPage { @@ -53,8 +53,9 @@ SetupPage {
property Fact _failsafeLeakPin: controller.getParameterFact(-1, "LEAK1_PIN")
property Fact _failsafeLeakLogic: controller.getParameterFact(-1, "LEAK1_LOGIC")
property Fact _failsafeEKFThreshold: controller.getParameterFact(-1, "FS_EKF_THRESH")
property Fact _failsafeBatteryVoltage: controller.getParameterFact(-1, "r.BATT_LOW_VOLT")
property Fact _failsafeBatteryCapacity: controller.getParameterFact(-1, "r.BATT_LOW_MAH")
property Fact _failsafeBatteryVoltage: controller.getParameterFact(-1, "r.BATT_LOW_VOLT", false)
property Fact _failsafeBatteryCapacity: controller.getParameterFact(-1, "r.BATT_LOW_MAH", false)
property bool _batteryDetected: controller.parameterExists(-1, "r.BATT_LOW_MAH")
property Fact _armingCheck: controller.getParameterFact(-1, "ARMING_CHECK")
@ -167,12 +168,21 @@ SetupPage { @@ -167,12 +168,21 @@ SetupPage {
FactComboBox {
id: batteryEnableCombo
enabled: _batteryDetected
width: failsafeSettings._editWidth
fact: _failsafeBatteryEnable
indexModel: false
}
QGCLabel {
text: qsTr("Power module not set up")
width: failsafeSettings._labelWidth
color: ggcPal.warningText
anchors.verticalCenter: batteryEnableCombo.verticalCenter
visible: !_batteryDetected
}
QGCLabel {
text: qsTr("Voltage:")
width: failsafeSettings._labelWidth
anchors.verticalCenter: batteryEnableCombo.verticalCenter

Write Preview
Loading…
Cancel
Save