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

AP_OSD: update to use capacity_remaining_pct() as a bool

Browse Source
This commit is contained in:
Willian Galvani 2020-04-23 13:22:17 -03:00 committed by Andrew Tridgell
parent b9452c83be
commit f7fa4b7c19
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -1255,16 +1255,22 @@ void AP_OSD_Screen::draw_altitude(uint8_t x, uint8_t y)
void AP_OSD_Screen::draw_bat_volt(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_bat_volt(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
uint8_t pct = battery.capacity_remaining_pct();
uint8_t p = (100 - pct) / 16.6;
float v = battery.voltage(); float v = battery.voltage();
uint8_t pct;
if (!battery.capacity_remaining_pct(pct)) {
// Do not show battery percentage
backend->write(x,y, v < osd->warn_batvolt, "%2.1f%c", (double)v, SYMBOL(SYM_VOLT));
return;
}
uint8_t p = (100 - pct) / 16.6;
backend->write(x,y, v < osd->warn_batvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT)); backend->write(x,y, v < osd->warn_batvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT));
} }
void AP_OSD_Screen::draw_avgcellvolt(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_avgcellvolt(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
uint8_t pct = battery.capacity_remaining_pct(); uint8_t pct = 0;
IGNORE_RETURN(battery.capacity_remaining_pct(pct));
uint8_t p = (100 - pct) / 16.6; uint8_t p = (100 - pct) / 16.6;
float v = battery.voltage(); float v = battery.voltage();
// calculate cell count - WARNING this can be inaccurate if the LIPO/LIION battery is far from fully charged when attached and is used in this panel // calculate cell count - WARNING this can be inaccurate if the LIPO/LIION battery is far from fully charged when attached and is used in this panel
@ -1283,7 +1289,8 @@ void AP_OSD_Screen::draw_avgcellvolt(uint8_t x, uint8_t y)
void AP_OSD_Screen::draw_restvolt(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_restvolt(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
uint8_t pct = battery.capacity_remaining_pct(); uint8_t pct = 0;
IGNORE_RETURN(battery.capacity_remaining_pct(pct));
uint8_t p = (100 - pct) / 16.6; uint8_t p = (100 - pct) / 16.6;
float v = battery.voltage_resting_estimate(); float v = battery.voltage_resting_estimate();
backend->write(x,y, v < osd->warn_restvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT)); backend->write(x,y, v < osd->warn_restvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT));
@ -1897,9 +1904,14 @@ void AP_OSD_Screen::draw_atemp(uint8_t x, uint8_t y)
void AP_OSD_Screen::draw_bat2_vlt(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_bat2_vlt(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
uint8_t pct2 = battery.capacity_remaining_pct(1); uint8_t pct2 = 0;
uint8_t p2 = (100 - pct2) / 16.6;
float v2 = battery.voltage(1); float v2 = battery.voltage(1);
if (!battery.capacity_remaining_pct(pct2, 1)) {
// Do not show battery percentage
backend->write(x,y, v2 < osd->warn_bat2volt, "%2.1f%c", (double)v2, SYMBOL(SYM_VOLT));
return;
}
uint8_t p2 = (100 - pct2) / 16.6;
backend->write(x,y, v2 < osd->warn_bat2volt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p2, (double)v2, SYMBOL(SYM_VOLT)); backend->write(x,y, v2 < osd->warn_bat2volt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p2, (double)v2, SYMBOL(SYM_VOLT));
} }