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

Fix broken voltage/current divider calculators (#9115)

QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
e5f4bfe4bb
commit
1e000bfd2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 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. 14
      src/AutoPilotPlugins/PX4/PowerComponent.qml

14
src/AutoPilotPlugins/PX4/PowerComponent.qml
Unescape View File

@ -418,7 +418,8 @@ SetupPage { @@ -418,7 +418,8 @@ SetupPage {
title: qsTr("Calculate Voltage Divider")
buttons: StandardButton.Close
property var _controller: controller
property var _controller: controller
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery" + (dialogProperties.batteryIndex - 1))
BatteryParams {
id: batParams
@ -443,7 +444,7 @@ SetupPage { @@ -443,7 +444,7 @@ SetupPage {
QGCTextField { id: measuredVoltage }
QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString }
QGCLabel { text: _batteryFactGroup.voltage.valueString }
QGCLabel { text: qsTr("Voltage divider:") }
FactLabel { fact: batParams.battVoltageDivider }
@ -457,7 +458,7 @@ SetupPage { @@ -457,7 +458,7 @@ SetupPage {
if (measuredVoltageValue === 0 || isNaN(measuredVoltageValue)) {
return
}
var newVoltageDivider = (measuredVoltageValue * batParams.battVoltageDivider.value) / controller.vehicle.battery.voltage.value
var newVoltageDivider = (measuredVoltageValue * batParams.battVoltageDivider.value) / _batteryFactGroup.voltage.value
if (newVoltageDivider > 0) {
batParams.battVoltageDivider.value = newVoltageDivider
}
@ -474,7 +475,8 @@ SetupPage { @@ -474,7 +475,8 @@ SetupPage {
title: qsTr("Calculate Amps per Volt")
buttons: StandardButton.Close
property var _controller: controller
property var _controller: controller
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery" + (dialogProperties.batteryIndex - 1))
BatteryParams {
id: batParams
@ -499,7 +501,7 @@ SetupPage { @@ -499,7 +501,7 @@ SetupPage {
QGCTextField { id: measuredCurrent }
QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString }
QGCLabel { text: _batteryFactGroup.current.valueString }
QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: batParams.battAmpsPerVolt }
@ -513,7 +515,7 @@ SetupPage { @@ -513,7 +515,7 @@ SetupPage {
if (measuredCurrentValue === 0 || isNaN(measuredCurrentValue)) {
return
}
var newAmpsPerVolt = (measuredCurrentValue * batParams.battAmpsPerVolt.value) / controller.vehicle.battery.current.value
var newAmpsPerVolt = (measuredCurrentValue * batParams.battAmpsPerVolt.value) / _batteryFactGroup.current.value
if (newAmpsPerVolt != 0) {
batParams.battAmpsPerVolt.value = newAmpsPerVolt
}

Write Preview
Loading…
Cancel
Save