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

AP_OSD: add and use AP_BATTERY_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2024-01-31 22:07:24 +11:00 committed by Andrew Tridgell
parent eda6d0b6a0
commit a8bc7761d3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -1334,6 +1334,7 @@ void AP_OSD_Screen::draw_altitude(uint8_t x, uint8_t y)
backend->write(x, y, false, "%4d%c", (int)u_scale(ALTITUDE, alt), u_icon(ALTITUDE)); backend->write(x, y, false, "%4d%c", (int)u_scale(ALTITUDE, alt), u_icon(ALTITUDE));
} }
#if AP_BATTERY_ENABLED
void AP_OSD_Screen::draw_bat_volt(uint8_t instance, VoltageType type, uint8_t x, uint8_t y) void AP_OSD_Screen::draw_bat_volt(uint8_t instance, VoltageType type, uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
@ -1409,6 +1410,7 @@ void AP_OSD_Screen::draw_restvolt(uint8_t x, uint8_t y)
{ {
draw_bat_volt(0,VoltageType::RESTING_VOLTAGE,x,y); draw_bat_volt(0,VoltageType::RESTING_VOLTAGE,x,y);
} }
#endif // AP_BATTERY_ENABLED
#if AP_RSSI_ENABLED #if AP_RSSI_ENABLED
void AP_OSD_Screen::draw_rssi(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_rssi(uint8_t x, uint8_t y)
@ -1434,6 +1436,7 @@ void AP_OSD_Screen::draw_link_quality(uint8_t x, uint8_t y)
} }
#endif // AP_RSSI_ENABLED #endif // AP_RSSI_ENABLED
#if AP_BATTERY_ENABLED
void AP_OSD_Screen::draw_current(uint8_t instance, uint8_t x, uint8_t y) void AP_OSD_Screen::draw_current(uint8_t instance, uint8_t x, uint8_t y)
{ {
float amps; float amps;
@ -1454,6 +1457,7 @@ void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y)
{ {
draw_current(0, x, y); draw_current(0, x, y);
} }
#endif
void AP_OSD_Screen::draw_fltmode(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_fltmode(uint8_t x, uint8_t y)
{ {
@ -1477,6 +1481,7 @@ void AP_OSD_Screen::draw_sats(uint8_t x, uint8_t y)
backend->write(x, y, flash, "%c%c%2u", SYMBOL(SYM_SAT_L), SYMBOL(SYM_SAT_R), nsat); backend->write(x, y, flash, "%c%c%2u", SYMBOL(SYM_SAT_L), SYMBOL(SYM_SAT_R), nsat);
} }
#if AP_BATTERY_ENABLED
void AP_OSD_Screen::draw_batused(uint8_t instance, uint8_t x, uint8_t y) void AP_OSD_Screen::draw_batused(uint8_t instance, uint8_t x, uint8_t y)
{ {
float mah; float mah;
@ -1495,6 +1500,7 @@ void AP_OSD_Screen::draw_batused(uint8_t x, uint8_t y)
{ {
draw_batused(0, x, y); draw_batused(0, x, y);
} }
#endif
//Autoscroll message is the same as in minimosd-extra. //Autoscroll message is the same as in minimosd-extra.
//Thanks to night-ghost for the approach. //Thanks to night-ghost for the approach.
@ -2035,6 +2041,7 @@ void AP_OSD_Screen::draw_flightime(uint8_t x, uint8_t y)
} }
} }
#if AP_BATTERY_ENABLED
void AP_OSD_Screen::draw_eff(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_eff(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
@ -2052,7 +2059,9 @@ void AP_OSD_Screen::draw_eff(uint8_t x, uint8_t y)
backend->write(x, y, false, "%c---%c", SYMBOL(SYM_EFF),SYMBOL(SYM_MAH)); backend->write(x, y, false, "%c---%c", SYMBOL(SYM_EFF),SYMBOL(SYM_MAH));
} }
} }
#endif // AP_BATTERY_ENABLED
#if AP_BATTERY_ENABLED
void AP_OSD_Screen::draw_climbeff(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_climbeff(uint8_t x, uint8_t y)
{ {
char unit_icon = u_icon(DISTANCE); char unit_icon = u_icon(DISTANCE);
@ -2082,6 +2091,7 @@ void AP_OSD_Screen::draw_climbeff(uint8_t x, uint8_t y)
backend->write(x, y, false,"%c%c---%c",SYMBOL(SYM_PTCHUP),SYMBOL(SYM_EFF),unit_icon); backend->write(x, y, false,"%c%c---%c",SYMBOL(SYM_PTCHUP),SYMBOL(SYM_EFF),unit_icon);
} }
} }
#endif
#if BARO_MAX_INSTANCES > 1 #if BARO_MAX_INSTANCES > 1
void AP_OSD_Screen::draw_btemp(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_btemp(uint8_t x, uint8_t y)