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

AP_OSD: Make per-cell voltage be shown to two decimal places again

Browse Source
This commit is contained in:
Michelle Rossouw 2023-09-27 14:23:32 +10:00 committed by Andrew Tridgell
parent dd7f65ec51
commit e59b7a5215
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -1354,7 +1354,7 @@ void AP_OSD_Screen::draw_bat_volt(uint8_t instance, VoltageType type, uint8_t x,
case VoltageType::RESTING_CELL: { case VoltageType::RESTING_CELL: {
blinkvolt = osd->warn_avgcellrestvolt; blinkvolt = osd->warn_avgcellrestvolt;
v = battery.voltage_resting_estimate(instance); v = battery.voltage_resting_estimate(instance);
FALLTHROUGH; FALLTHROUGH;
} }
case VoltageType::AVG_CELL: { case VoltageType::AVG_CELL: {
if (type == VoltageType::AVG_CELL) { //for fallthrough of RESTING_CELL if (type == VoltageType::AVG_CELL) { //for fallthrough of RESTING_CELL
@ -1376,10 +1376,18 @@ void AP_OSD_Screen::draw_bat_volt(uint8_t instance, VoltageType type, uint8_t x,
} }
if (!show_remaining_pct) { if (!show_remaining_pct) {
// Do not show battery percentage // Do not show battery percentage
backend->write(x,y, v < blinkvolt, "%2.1f%c", (double)v, SYMBOL(SYM_VOLT)); if (type == VoltageType::RESTING_CELL || type == VoltageType::AVG_CELL) {
backend->write(x,y, v < blinkvolt, "%1.2f%c", (double)v, SYMBOL(SYM_VOLT));
} else {
backend->write(x,y, v < blinkvolt, "%2.1f%c", (double)v, SYMBOL(SYM_VOLT));
}
return; return;
} }
backend->write(x,y, v < blinkvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT)); if (type == VoltageType::RESTING_CELL || type == VoltageType::AVG_CELL) {
backend->write(x,y, v < blinkvolt, "%c%1.2f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT));
} else {
backend->write(x,y, v < blinkvolt, "%c%2.1f%c", SYMBOL(SYM_BATT_FULL) + p, (double)v, SYMBOL(SYM_VOLT));
}
} }
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)