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

Merge pull request #6660 from DonLakeFlyer/ArduPilotBattery 

ArduPilot: More work for new battery stuff
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
141239cccb 58b85d0bd9
commit
10afa650d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 134 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/AutoPilotPlugins/APM/APMPowerComponent.qml
  2. 227
      src/AutoPilotPlugins/APM/APMSafetyComponent.qml

18
src/AutoPilotPlugins/APM/APMPowerComponent.qml
Unescape View File

@ -43,6 +43,8 @@ SetupPage {
property bool _batt2MonitorEnabled: _batt2MonitorAvailable && _batt2Monitor.rawValue !== 0 property bool _batt2MonitorEnabled: _batt2MonitorAvailable && _batt2Monitor.rawValue !== 0
property bool _batt1ParamsAvailable: controller.parameterExists(-1, "BATT_CAPACITY") property bool _batt1ParamsAvailable: controller.parameterExists(-1, "BATT_CAPACITY")
property bool _batt2ParamsAvailable: controller.parameterExists(-1, "BATT2_CAPACITY") property bool _batt2ParamsAvailable: controller.parameterExists(-1, "BATT2_CAPACITY")
property bool _showBatt1Reboot: _batt1MonitorEnabled && !_batt1ParamsAvailable
property bool _showBatt2Reboot: _batt2MonitorEnabled && !_batt2ParamsAvailable
property string _restartRequired: qsTr("Requires vehicle reboot") property string _restartRequired: qsTr("Requires vehicle reboot")
@ -84,7 +86,13 @@ SetupPage {
QGCLabel { QGCLabel {
text: _restartRequired text: _restartRequired
visible: _batt1MonitorEnabled && !_batt1ParamsAvailable visible: _showBatt1Reboot
}
QGCButton {
text: qsTr("Reboot vehicle")
visible: _showBatt1Reboot
onClicked: controller.vehicle.rebootVehicle()
} }
} }
} }
@ -162,7 +170,13 @@ SetupPage {
QGCLabel { QGCLabel {
text: _restartRequired text: _restartRequired
visible: _batt2MonitorEnabled && !_batt2ParamsAvailable visible: _showBatt2Reboot
}
QGCButton {
text: qsTr("Reboot vehicle")
visible: _showBatt2Reboot
onClicked: controller.vehicle.rebootVehicle()
} }
} }
} }

227
src/AutoPilotPlugins/APM/APMSafetyComponent.qml
Unescape View File

@ -46,23 +46,103 @@ SetupPage {
property Fact _failsafeBatt2LowAct: controller.getParameterFact(-1, "BATT2_FS_LOW_ACT", false /* reportMissing */) property Fact _failsafeBatt2LowAct: controller.getParameterFact(-1, "BATT2_FS_LOW_ACT", false /* reportMissing */)
property Fact _failsafeBatt1CritAct: controller.getParameterFact(-1, "BATT_FS_CRT_ACT", false /* reportMissing */) property Fact _failsafeBatt1CritAct: controller.getParameterFact(-1, "BATT_FS_CRT_ACT", false /* reportMissing */)
property Fact _failsafeBatt2CritAct: controller.getParameterFact(-1, "BATT2_FS_CRT_ACT", false /* reportMissing */) property Fact _failsafeBatt2CritAct: controller.getParameterFact(-1, "BATT2_FS_CRT_ACT", false /* reportMissing */)
property Fact _failsafeBatt1Mah: controller.getParameterFact(-1, "BATT_LOW_MAH", false /* reportMissing */) property Fact _failsafeBatt1LowMah: controller.getParameterFact(-1, "BATT_LOW_MAH", false /* reportMissing */)
property Fact _failsafeBatt2Mah: controller.getParameterFact(-1, "BATT2_LOW_MAH", false /* reportMissing */) property Fact _failsafeBatt2LowMah: controller.getParameterFact(-1, "BATT2_LOW_MAH", false /* reportMissing */)
property Fact _failsafeBatt1Voltage: controller.getParameterFact(-1, "BATT_LOW_VOLT", false /* reportMissing */) property Fact _failsafeBatt1CritMah: controller.getParameterFact(-1, "BATT_CRT_MAH", false /* reportMissing */)
property Fact _failsafeBatt2Voltage: controller.getParameterFact(-1, "BATT2_LOW_VOLT", false /* reportMissing */) property Fact _failsafeBatt2CritMah: controller.getParameterFact(-1, "BATT2_CRT_MAH", false /* reportMissing */)
property Fact _failsafeBatt1LowVoltage: controller.getParameterFact(-1, "BATT_LOW_VOLT", false /* reportMissing */)
property Fact _failsafeBatt2LowVoltage: controller.getParameterFact(-1, "BATT2_LOW_VOLT", false /* reportMissing */)
property Fact _failsafeBatt1CritVoltage: controller.getParameterFact(-1, "BATT_CRT_VOLT", false /* reportMissing */)
property Fact _failsafeBatt2CritVoltage: controller.getParameterFact(-1, "BATT2_CRT_VOLT", false /* reportMissing */)
property Fact _armingCheck: controller.getParameterFact(-1, "ARMING_CHECK") property Fact _armingCheck: controller.getParameterFact(-1, "ARMING_CHECK")
property real _margins: ScreenTools.defaultFontPixelHeight property real _margins: ScreenTools.defaultFontPixelHeight
property bool _showIcon: !ScreenTools.isTinyScreen property bool _showIcon: !ScreenTools.isTinyScreen
property string _restartRequired: qsTr("Requires vehicle reboot")
ExclusiveGroup { id: fenceActionRadioGroup } ExclusiveGroup { id: fenceActionRadioGroup }
ExclusiveGroup { id: landLoiterRadioGroup } ExclusiveGroup { id: landLoiterRadioGroup }
ExclusiveGroup { id: returnAltRadioGroup } ExclusiveGroup { id: returnAltRadioGroup }
Component {
id: batteryFailsafeComponent
Column {
spacing: _margins
GridLayout {
id: gridLayout
columnSpacing: _margins
rowSpacing: _margins
columns: 2
QGCLabel { text: qsTr("Low action:") }
FactComboBox {
fact: failsafeBattLowAct
indexModel: false
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Critical action:") }
FactComboBox {
fact: failsafeBattCritAct
indexModel: false
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Low voltage threshold:") }
FactTextField {
fact: failsafeBattLowVoltage
showUnits: true
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Critical voltage threshold:") }
FactTextField {
fact: failsafeBattCritVoltage
showUnits: true
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Low mAh threshold:") }
FactTextField {
fact: failsafeBattLowMah
showUnits: true
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Critical mAh threshold:") }
FactTextField {
fact: failsafeBattCritMah
showUnits: true
Layout.fillWidth: true
}
} // GridLayout
} // Column
}
Component {
id: restartRequiredComponent
ColumnLayout {
spacing: ScreenTools.defaultFontPixelWidth
QGCLabel {
text: _restartRequired
}
QGCButton {
text: qsTr("Reboot vehicle")
onClicked: controller.vehicle.rebootVehicle()
}
}
}
Column { Column {
spacing: _margins / 2 spacing: _margins / 2
visible: _batt1MonitorEnabled && _batt1ParamsAvailable visible: _batt1MonitorEnabled
QGCLabel { QGCLabel {
text: qsTr("Battery1 Failsafe Triggers") text: qsTr("Battery1 Failsafe Triggers")
@ -70,67 +150,33 @@ SetupPage {
} }
Rectangle { Rectangle {
width: batteryFailsafeColumn.x + batteryFailsafeColumn.width + _margins width: battery1FailsafeLoader.x + battery1FailsafeLoader.width + _margins
height: batteryFailsafeColumn.y + batteryFailsafeColumn.height + _margins height: battery1FailsafeLoader.y + battery1FailsafeLoader.height + _margins
color: ggcPal.windowShade color: ggcPal.windowShade
Column { Loader {
id: batteryFailsafeColumn id: battery1FailsafeLoader
anchors.margins: _margins anchors.margins: _margins
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
spacing: _margins sourceComponent: _batt1ParamsAvailable ? batteryFailsafeComponent : restartRequiredComponent
GridLayout { property Fact battMonitor: _batt1Monitor
id: gridLayout property bool battParamsAvailable: _batt1ParamsAvailable
columnSpacing: _margins property Fact failsafeBattLowAct: _failsafeBatt1LowAct
rowSpacing: _margins property Fact failsafeBattCritAct: _failsafeBatt1CritAct
columns: 2 property Fact failsafeBattLowMah: _failsafeBatt1LowMah
QGCLabel { text: qsTr("Battery low action:") } property Fact failsafeBattCritMah: _failsafeBatt1CritMah
FactComboBox { property Fact failsafeBattLowVoltage: _failsafeBatt1LowVoltage
fact: _failsafeBatt1LowAct property Fact failsafeBattCritVoltage: _failsafeBatt1CritVoltage
indexModel: false }
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Battery critical action:")
}
FactComboBox {
fact: _failsafeBatt1CritAct
indexModel: false
Layout.fillWidth: true
}
QGCCheckBox {
text: qsTr("Voltage threshold:")
checked: _failsafeBatt1Voltage.value != 0
onClicked: _failsafeBatt1Voltage.value = checked ? 10.5 : 0
}
FactTextField {
fact: _failsafeBatt1Voltage
showUnits: true
Layout.fillWidth: true
}
QGCCheckBox {
text: qsTr("MAH threshold:")
checked: _failsafeBatt1Mah.value != 0
onClicked: _failsafeBatt1Mah.value = checked ? 600 : 0
}
FactTextField {
fact: _failsafeBatt1Mah
showUnits: true
Layout.fillWidth: true
}
} // GridLayout
} // Column
} // Rectangle } // Rectangle
} // Column - Battery Failsafe Settings } // Column - Battery Failsafe Settings
Column { Column {
spacing: _margins / 2 spacing: _margins / 2
visible: _batt2MonitorEnabled && _batt2ParamsAvailable visible: _batt2MonitorEnabled
QGCLabel { QGCLabel {
text: qsTr("Battery2 Failsafe Triggers") text: qsTr("Battery2 Failsafe Triggers")
@ -138,65 +184,28 @@ SetupPage {
} }
Rectangle { Rectangle {
id: failsafeSettings width: battery2FailsafeLoader.x + battery2FailsafeLoader.width + _margins
width: battery2FailsafeColumn.x + battery2FailsafeColumn.width + _margins height: battery2FailsafeLoader.y + battery2FailsafeLoader.height + _margins
height: battery2FailsafeColumn.y + battery2FailsafeColumn.height + _margins
color: ggcPal.windowShade color: ggcPal.windowShade
Column { Loader {
id: battery2FailsafeColumn id: battery2FailsafeLoader
anchors.margins: _margins anchors.margins: _margins
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
spacing: _margins sourceComponent: _batt2ParamsAvailable ? batteryFailsafeComponent : restartRequiredComponent
GridLayout { property Fact battMonitor: _batt2Monitor
columnSpacing: _margins property bool battParamsAvailable: _batt2ParamsAvailable
rowSpacing: _margins property Fact failsafeBattLowAct: _failsafeBatt2LowAct
columns: 2 property Fact failsafeBattCritAct: _failsafeBatt2CritAct
visible: _batt2MonitorEnabled && _failsafeBatt2LowActAvailable property Fact failsafeBattLowMah: _failsafeBatt2LowMah
property Fact failsafeBattCritMah: _failsafeBatt2CritMah
QGCLabel { text: qsTr("Battery low action:") } property Fact failsafeBattLowVoltage: _failsafeBatt2LowVoltage
FactComboBox { property Fact failsafeBattCritVoltage: _failsafeBatt2CritVoltage
fact: _failsafeBatt2LowAct }
indexModel: false
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Battery critical action:")
}
FactComboBox {
fact: _failsafeBatt2CritAct
indexModel: false
Layout.fillWidth: true
}
QGCCheckBox {
text: qsTr("Voltage threshold:")
checked: _failsafeBatt2Voltage.value != 0
onClicked: _failsafeBatt2Voltage.value = checked ? 10.5 : 0
}
FactTextField {
fact: _failsafeBatt2Voltage
showUnits: true
Layout.fillWidth: true
}
QGCCheckBox {
text: qsTr("MAH threshold:")
checked: _failsafeBatt2Mah.value != 0
onClicked: _failsafeBatt2Mah.value = checked ? 600 : 0
}
FactTextField {
fact: _failsafeBatt2Mah
showUnits: true
Layout.fillWidth: true
}
} // GridLayout
} // Column
} // Rectangle } // Rectangle
} // Column - Battery2 Failsafe Settings } // Column - Battery Failsafe Settings
Component { Component {
id: planeGeneralFS id: planeGeneralFS

Write Preview
Loading…
Cancel
Save