Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 17:18:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor_Backend: change capacity_remaining_pct() to a bool

Browse Source
This commit is contained in:
Willian Galvani 2020-04-23 13:17:09 -03:00
parent d5130e1f0e
commit 206d047ab1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_BattMonitor/AP_BattMonitor_Backend.cpp
View File

@ -30,15 +30,16 @@ AP_BattMonitor_Backend::AP_BattMonitor_Backend(AP_BattMonitor &mon, AP_BattMonit
{
}
/// capacity_remaining_pct - returns the % battery capacity remaining (0 ~ 100)
uint8_t AP_BattMonitor_Backend::capacity_remaining_pct() const
/// capacity_remaining_pct - returns true if the battery % is available and writes to the percentage argument
bool AP_BattMonitor_Backend::capacity_remaining_pct(uint8_t &percentage) const
{
float mah_remaining = _params._pack_capacity - _state.consumed_mah;
if ( _params._pack_capacity > 10 ) { // a very very small battery
return MIN(MAX((100 * (mah_remaining) / _params._pack_capacity), 0), UINT8_MAX);
} else {
return 0;
// we consider anything under 10 mAh as being an invalid capacity and so will be our measurement of remaining capacity
if ( _params._pack_capacity <= 10) {
return false;
}
const float mah_remaining = _params._pack_capacity - _state.consumed_mah;
percentage = constrain_float(100 * mah_remaining / _params._pack_capacity, 0, UINT8_MAX);
return true;
}
// update battery resistance estimate

4
libraries/AP_BattMonitor/AP_BattMonitor_Backend.h
View File

@ -46,8 +46,8 @@ public:
// returns true if battery monitor provides temperature
virtual bool has_temperature() const { return false; }
/// capacity_remaining_pct - returns the % battery capacity remaining (0 ~ 100)
virtual uint8_t capacity_remaining_pct() const;
/// capacity_remaining_pct - returns true if the percentage is valid and writes to percentage argument
virtual bool capacity_remaining_pct(uint8_t &percentage) const WARN_IF_UNUSED;
// return true if cycle count can be provided and fills in cycles argument
virtual bool get_cycle_count(uint16_t &cycles) const { return false; }