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

AP_OSD: refactor current panel and add 2nd instance

Browse Source
This commit is contained in:
vierfuffzig 2020-11-21 19:08:56 +01:00 committed by Andrew Tridgell
parent 54bae68e02
commit c4a644100d
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_OSD/AP_OSD.h
View File

@ -176,6 +176,7 @@ private:
AP_OSD_Setting atemp{false, 0, 0};
AP_OSD_Setting bat2_vlt{false, 0, 0};
AP_OSD_Setting bat2used{false, 0, 0};
AP_OSD_Setting current2{false, 0, 0};
AP_OSD_Setting clk{false, 0, 0};
#if HAL_PLUSCODE_ENABLE
AP_OSD_Setting pluscode{false, 0, 0};
@ -196,6 +197,7 @@ private:
void draw_bat_volt(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 instance, 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);
@ -245,6 +247,7 @@ private:
void draw_bat2used(uint8_t x, uint8_t y);
void draw_clk(uint8_t x, uint8_t y);
void draw_callsign(uint8_t x, uint8_t y);
void draw_current2(uint8_t x, uint8_t y);
struct {
bool load_attempted;

32
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -878,6 +878,22 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = {
AP_SUBGROUPINFO(callsign, "CALLSIGN", 53, AP_OSD_Screen, AP_OSD_Setting),
#endif
// @Param: CURRENT2_EN
// @DisplayName: CURRENT2_EN
// @Description: Displays 2nd battery current
// @Values: 0:Disabled,1:Enabled
// @Param: CURRENT2_X
// @DisplayName: CURRENT2_X
// @Description: Horizontal position on screen
// @Range: 0 29
// @Param: CURRENT2_Y
// @DisplayName: CURRENT2_Y
// @Description: Vertical position on screen
// @Range: 0 15
AP_SUBGROUPINFO(current2, "CURRENT2", 54, AP_OSD_Screen, AP_OSD_Setting),
AP_GROUPEND
};
@ -1118,11 +1134,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 instance, uint8_t x, uint8_t y)
{
AP_BattMonitor &battery = AP::battery();
float amps;
if (!battery.current_amps(amps)) {
if (!AP::battery().current_amps(amps, instance)) {
osd->avg_current_a = 0;
}
//filter current and display with autoranging for low values
@ -1135,6 +1150,11 @@ void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y)
}
}
void AP_OSD_Screen::draw_current(uint8_t x, uint8_t y)
{
draw_current(0, x, y);
}
void AP_OSD_Screen::draw_fltmode(uint8_t x, uint8_t y)
{
AP_Notify * notify = AP_Notify::get_singleton();
@ -1795,6 +1815,11 @@ void AP_OSD_Screen::draw_callsign(uint8_t x, uint8_t y)
#endif
}
void AP_OSD_Screen::draw_current2(uint8_t x, uint8_t y)
{
draw_current(1, x, y);
}
#define DRAW_SETTING(n) if (n.enabled) draw_ ## n(n.xpos, n.ypos)
#if HAL_WITH_OSD_BITMAP
@ -1855,6 +1880,7 @@ void AP_OSD_Screen::draw(void)
DRAW_SETTING(climbeff);
DRAW_SETTING(eff);
DRAW_SETTING(callsign);
DRAW_SETTING(current2);
}
#endif
#endif // OSD_ENABLED