Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-20 15:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_Common: create virtual get_battery_remaining_percentage()

Browse Source
This commit is contained in:
Willian Galvani 2020-03-05 14:36:23 -03:00 committed by Jacob Walser
parent 799ac6f741
commit 7855d324b3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/GCS_MAVLink/GCS.h
View File

@ -431,6 +431,7 @@ protected:
virtual float vfr_hud_airspeed() const;
virtual int16_t vfr_hud_throttle() const { return 0; }
virtual float vfr_hud_alt() const;
virtual uint8_t get_battery_remaining_percentage();
static constexpr const float magic_force_arm_value = 2989.0f;
static constexpr const float magic_force_disarm_value = 21196.0f;

7
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -3931,7 +3931,7 @@ void GCS_MAVLINK::send_sys_status()
int8_t battery_remaining;
if (battery.healthy() && battery.current_amps(battery_current)) {
battery_remaining = battery.capacity_remaining_pct();
battery_remaining = get_battery_remaining_percentage();
battery_current *= 100;
} else {
battery_current = -1;
@ -4661,6 +4661,11 @@ void GCS_MAVLINK::manual_override(RC_Channel *c, int16_t value_in, const uint16_
c->set_override(override_value, tnow);
}
uint8_t GCS_MAVLINK::get_battery_remaining_percentage() {
const AP_BattMonitor &battery = AP::battery();
return battery.capacity_remaining_pct();
}
GCS &gcs()
{
return *GCS::get_singleton();