Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: NFC adapt to new AP_Battery method name

This commit is contained in:
Dr.-Ing. Amilcar Do Carmo Lucas 2018-02-15 17:10:37 +01:00 committed by Francisco Ferreira
parent 3632cd7588
commit 03019918cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -200,8 +200,8 @@ void GCS_MAVLINK::send_battery_status(const AP_BattMonitor &battery, const uint8
MAV_BATTERY_TYPE_UNKNOWN, // type MAV_BATTERY_TYPE_UNKNOWN, // type
got_temperature ? ((int16_t) (temp * 100)) : INT16_MAX, // temperature. INT16_MAX if unknown got_temperature ? ((int16_t) (temp * 100)) : INT16_MAX, // temperature. INT16_MAX if unknown
battery.get_cell_voltages(instance).cells, // cell voltages battery.get_cell_voltages(instance).cells, // cell voltages
battery.has_current(instance) ? battery.current_amps(instance) * 100 : -1, // current battery.has_current(instance) ? battery.current_amps(instance) * 100 : -1, // current in centiampere
battery.has_current(instance) ? battery.current_total_mah(instance) : -1, // total current battery.has_current(instance) ? battery.consumed_mah(instance) : -1, // total consumed current in milliampere.hour
battery.has_consumed_energy(instance) ? battery.consumed_wh(instance) * 36 : -1, // consumed energy in hJ (hecto-Joules) battery.has_consumed_energy(instance) ? battery.consumed_wh(instance) * 36 : -1, // consumed energy in hJ (hecto-Joules)
battery.capacity_remaining_pct(instance)); battery.capacity_remaining_pct(instance));
} }