Commit 064be228 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4298 from DonLakeFlyer/Vehicle.Battery.Current

Change Vehicle.Battery.current to Amps units
parents 5ecd8049 ee061d43
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"shortDescription": "Current", "shortDescription": "Current",
"type": "int32", "type": "int32",
"decimalPlaces": 0, "decimalPlaces": 0,
"units": "mA" "units": "A"
}, },
{ {
"name": "temperature", "name": "temperature",
......
...@@ -657,7 +657,8 @@ void Vehicle::_handleSysStatus(mavlink_message_t& message) ...@@ -657,7 +657,8 @@ void Vehicle::_handleSysStatus(mavlink_message_t& message)
if (sysStatus.current_battery == -1) { if (sysStatus.current_battery == -1) {
_batteryFactGroup.current()->setRawValue(VehicleBatteryFactGroup::_currentUnavailable); _batteryFactGroup.current()->setRawValue(VehicleBatteryFactGroup::_currentUnavailable);
} else { } else {
_batteryFactGroup.current()->setRawValue((double)sysStatus.current_battery * 10); // Current is in Amps, current_battery is 10 * milliamperes (1 = 10 milliampere)
_batteryFactGroup.current()->setRawValue((int)(sysStatus.current_battery / 100));
} }
if (sysStatus.voltage_battery == UINT16_MAX) { if (sysStatus.voltage_battery == UINT16_MAX) {
_batteryFactGroup.voltage()->setRawValue(VehicleBatteryFactGroup::_voltageUnavailable); _batteryFactGroup.voltage()->setRawValue(VehicleBatteryFactGroup::_voltageUnavailable);
......
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