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

AP_OSD: Refactor battery current interface

Browse Source
This commit is contained in:
Michael du Breuil 2019-07-07 14:39:31 +00:00 committed by WickedShell
parent e3f1ef0c5e
commit 10410b696c
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_OSD/AP_OSD.cpp
View File

@ -275,8 +275,10 @@ void AP_OSD::stats()
max_alt_m = fmaxf(max_alt_m, alt); max_alt_m = fmaxf(max_alt_m, alt);
// maximum current // maximum current
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
float amps = battery.current_amps(); float amps;
if (battery.current_amps(amps)) {
max_current_a = fmaxf(max_current_a, amps); max_current_a = fmaxf(max_current_a, amps);
}
} }

1
libraries/AP_OSD/AP_OSD.h
View File

@ -135,6 +135,7 @@ private:
void draw_rssi(uint8_t x, uint8_t y); void draw_rssi(uint8_t x, uint8_t y);
void draw_current(uint8_t x, uint8_t y); void draw_current(uint8_t x, uint8_t y);
void draw_batused(uint8_t x, uint8_t y); void draw_batused(uint8_t x, uint8_t y);
void draw_batused(uint8_t instance, uint8_t x, uint8_t y);
void draw_sats(uint8_t x, uint8_t y); void draw_sats(uint8_t x, uint8_t y);
void draw_fltmode(uint8_t x, uint8_t y); void draw_fltmode(uint8_t x, uint8_t y);
void draw_message(uint8_t x, uint8_t y); void draw_message(uint8_t x, uint8_t y);

39
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -459,7 +459,10 @@ void AP_OSD_Screen::draw_rssi(uint8_t x, uint8_t y)
void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
float amps = battery.current_amps(); float amps;
if (!battery.current_amps(amps)) {
amps = 0;
}
backend->write(x, y, false, "%2.1f%c", (double)amps, SYM_AMP); backend->write(x, y, false, "%2.1f%c", (double)amps, SYM_AMP);
} }
@ -485,10 +488,23 @@ void AP_OSD_Screen::draw_sats(uint8_t x, uint8_t y)
backend->write(x, y, flash, "%c%c%2u", SYM_SAT_L, SYM_SAT_R, nsat); backend->write(x, y, flash, "%c%c%2u", SYM_SAT_L, SYM_SAT_R, nsat);
} }
void AP_OSD_Screen::draw_batused(uint8_t instance, uint8_t x, uint8_t y)
{
float mah;
if (!AP::battery().consumed_mah(mah, instance)) {
mah = 0;
}
if (mah <= 9999) {
backend->write(x,y, false, "%4d%c", (int)mah, SYM_MAH);
} else {
const float ah = mah * 1e-3f;
backend->write(x,y, false, "%2.2f%c", (double)ah, SYM_AH);
}
}
void AP_OSD_Screen::draw_batused(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_batused(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); draw_batused(0, x, y);
backend->write(x,y, false, "%4d%c", (int)battery.consumed_mah(), SYM_MAH);
} }
//Autoscroll message is the same as in minimosd-extra. //Autoscroll message is the same as in minimosd-extra.
@ -922,8 +938,9 @@ void AP_OSD_Screen::draw_eff(uint8_t x, uint8_t y)
WITH_SEMAPHORE(ahrs.get_semaphore()); WITH_SEMAPHORE(ahrs.get_semaphore());
Vector2f v = ahrs.groundspeed_vector(); Vector2f v = ahrs.groundspeed_vector();
float speed = u_scale(SPEED,v.length()); float speed = u_scale(SPEED,v.length());
if (speed > 2.0){ float current_amps;
backend->write(x, y, false, "%c%3d%c", SYM_EFF,int(1000*battery.current_amps()/speed),SYM_MAH); if ((speed > 2.0) && battery.current_amps(current_amps)){
backend->write(x, y, false, "%c%3d%c", SYM_EFF,int(1000.0f*current_amps/speed),SYM_MAH);
} else { } else {
backend->write(x, y, false, "%c---%c", SYM_EFF,SYM_MAH); backend->write(x, y, false, "%c---%c", SYM_EFF,SYM_MAH);
} }
@ -945,8 +962,8 @@ void AP_OSD_Screen::draw_climbeff(uint8_t x, uint8_t y)
} }
if (vspd < 0.0) vspd = 0.0; if (vspd < 0.0) vspd = 0.0;
AP_BattMonitor &battery = AP::battery(); AP_BattMonitor &battery = AP::battery();
float amps = battery.current_amps(); float amps;
if (amps > 0.0) { if (battery.current_amps(amps) && is_positive(amps)) {
backend->write(x, y, false,"%c%c%3.1f%c",SYM_PTCHUP,SYM_EFF,(double)(3.6f * u_scale(VSPEED,vspd)/amps),unit_icon); backend->write(x, y, false,"%c%c%3.1f%c",SYM_PTCHUP,SYM_EFF,(double)(3.6f * u_scale(VSPEED,vspd)/amps),unit_icon);
} else { } else {
backend->write(x, y, false,"%c%c---%c",SYM_PTCHUP,SYM_EFF,unit_icon); backend->write(x, y, false,"%c%c---%c",SYM_PTCHUP,SYM_EFF,unit_icon);
@ -986,13 +1003,7 @@ void AP_OSD_Screen::draw_bat2_vlt(uint8_t x, uint8_t y)
void AP_OSD_Screen::draw_bat2used(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_bat2used(uint8_t x, uint8_t y)
{ {
AP_BattMonitor &battery = AP::battery(); draw_batused(1, x, y);
float ah = battery.consumed_mah(1) / 1000;
if (battery.consumed_mah(1) <= 9999) {
backend->write(x,y, false, "%4d%c", (int)battery.consumed_mah(1), SYM_MAH);
} else {
backend->write(x,y, false, "%2.2f%c", (double)ah, SYM_AH);
}
} }
void AP_OSD_Screen::draw_aspd2(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_aspd2(uint8_t x, uint8_t y)