Skip to content

Q
qgroundcontrol
Unverified Commit 1e000bfd authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Fix broken voltage/current divider calculators (#9115)

parent e5f4bfe4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ 1e000bfd
...@@ -418,7 +418,8 @@ SetupPage { ...@@ -418,7 +418,8 @@ SetupPage {
title: qsTr("Calculate Voltage Divider") title: qsTr("Calculate Voltage Divider")
buttons: StandardButton.Close buttons: StandardButton.Close
property var _controller: controller property var _controller: controller
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery" + (dialogProperties.batteryIndex - 1))
BatteryParams { BatteryParams {
id: batParams id: batParams
...@@ -443,7 +444,7 @@ SetupPage { ...@@ -443,7 +444,7 @@ SetupPage {
QGCTextField { id: measuredVoltage } QGCTextField { id: measuredVoltage }
QGCLabel { text: qsTr("Vehicle voltage:") } QGCLabel { text: qsTr("Vehicle voltage:") }
QGCLabel { text: controller.vehicle.battery.voltage.valueString } QGCLabel { text: _batteryFactGroup.voltage.valueString }
QGCLabel { text: qsTr("Voltage divider:") } QGCLabel { text: qsTr("Voltage divider:") }
FactLabel { fact: batParams.battVoltageDivider } FactLabel { fact: batParams.battVoltageDivider }
...@@ -457,7 +458,7 @@ SetupPage { ...@@ -457,7 +458,7 @@ SetupPage {
if (measuredVoltageValue === 0 || isNaN(measuredVoltageValue)) { if (measuredVoltageValue === 0 || isNaN(measuredVoltageValue)) {
return return
} }
var newVoltageDivider = (measuredVoltageValue * batParams.battVoltageDivider.value) / controller.vehicle.battery.voltage.value var newVoltageDivider = (measuredVoltageValue * batParams.battVoltageDivider.value) / _batteryFactGroup.voltage.value
if (newVoltageDivider > 0) { if (newVoltageDivider > 0) {
batParams.battVoltageDivider.value = newVoltageDivider batParams.battVoltageDivider.value = newVoltageDivider
} }
...@@ -474,7 +475,8 @@ SetupPage { ...@@ -474,7 +475,8 @@ SetupPage {
title: qsTr("Calculate Amps per Volt") title: qsTr("Calculate Amps per Volt")
buttons: StandardButton.Close buttons: StandardButton.Close
property var _controller: controller property var _controller: controller
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery" + (dialogProperties.batteryIndex - 1))
BatteryParams { BatteryParams {
id: batParams id: batParams
...@@ -499,7 +501,7 @@ SetupPage { ...@@ -499,7 +501,7 @@ SetupPage {
QGCTextField { id: measuredCurrent } QGCTextField { id: measuredCurrent }
QGCLabel { text: qsTr("Vehicle current:") } QGCLabel { text: qsTr("Vehicle current:") }
QGCLabel { text: controller.vehicle.battery.current.valueString } QGCLabel { text: _batteryFactGroup.current.valueString }
QGCLabel { text: qsTr("Amps per volt:") } QGCLabel { text: qsTr("Amps per volt:") }
FactLabel { fact: batParams.battAmpsPerVolt } FactLabel { fact: batParams.battAmpsPerVolt }
...@@ -513,7 +515,7 @@ SetupPage { ...@@ -513,7 +515,7 @@ SetupPage {
if (measuredCurrentValue === 0 || isNaN(measuredCurrentValue)) { if (measuredCurrentValue === 0 || isNaN(measuredCurrentValue)) {
return return
} }
var newAmpsPerVolt = (measuredCurrentValue * batParams.battAmpsPerVolt.value) / controller.vehicle.battery.current.value var newAmpsPerVolt = (measuredCurrentValue * batParams.battAmpsPerVolt.value) / _batteryFactGroup.current.value
if (newAmpsPerVolt != 0) { if (newAmpsPerVolt != 0) {
batParams.battAmpsPerVolt.value = newAmpsPerVolt batParams.battAmpsPerVolt.value = newAmpsPerVolt
} }
......
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