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

Fix APM PowerComponent to use the battery FactGroups

QGC4.4
Hugo Trippaers 4 years ago committed by Don Gagne
parent
44be3032b1
commit
8381e98bfd
1 changed files with 6 additions and 4 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. 10
      src/AutoPilotPlugins/APM/APMPowerComponent.qml

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

@ -130,8 +130,9 @@ SetupPage { @@ -130,8 +130,9 @@ SetupPage {
property Fact battMonitor: controller.getParameterFact(-1, "BATT_MONITOR", false /* reportMissing */)
property Fact battVoltMult: controller.getParameterFact(-1, "BATT_VOLT_MULT", false /* reportMissing */)
property Fact battVoltPin: controller.getParameterFact(-1, "BATT_VOLT_PIN", false /* reportMissing */)
property Fact vehicleVoltage: controller.vehicle.battery.voltage
property Fact vehicleCurrent: controller.vehicle.battery.current
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery0")
property Fact vehicleVoltage: _batteryFactGroup.voltage
property Fact vehicleCurrent: _batteryFactGroup.current
}
}
}
@ -215,8 +216,9 @@ SetupPage { @@ -215,8 +216,9 @@ SetupPage {
property Fact battMonitor: controller.getParameterFact(-1, "BATT2_MONITOR", false /* reportMissing */)
property Fact battVoltMult: controller.getParameterFact(-1, "BATT2_VOLT_MULT", false /* reportMissing */)
property Fact battVoltPin: controller.getParameterFact(-1, "BATT2_VOLT_PIN", false /* reportMissing */)
property Fact vehicleVoltage: controller.vehicle.battery2.voltage
property Fact vehicleCurrent: controller.vehicle.battery2.current
property FactGroup _batteryFactGroup: controller.vehicle.getFactGroup("battery1")
property Fact vehicleVoltage: _batteryFactGroup.voltage
property Fact vehicleCurrent: _batteryFactGroup.current
}
}
}

Write Preview
Loading…
Cancel
Save