Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: #if sidebars

This commit is contained in:
Sebastian Quilter 2021-09-26 13:24:03 -07:00 committed by Andrew Tridgell
parent 9a58ccb3cd
commit 69120fa1c7
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_OSD/AP_OSD.h
View File

@ -38,6 +38,10 @@
#define OSD_PARAM_ENABLED !HAL_MINIMIZE_FEATURES
#endif
#ifndef HAL_OSD_SIDEBAR_ENABLE
#define HAL_OSD_SIDEBAR_ENABLE !HAL_MINIMIZE_FEATURES
#endif
class AP_OSD_Backend;
class AP_MSP;
@ -223,7 +227,9 @@ private:
void draw_home(uint8_t x, uint8_t y);
void draw_throttle(uint8_t x, uint8_t y);
void draw_heading(uint8_t x, uint8_t y);
#ifdef HAL_OSD_SIDEBAR_ENABLE
void draw_sidebars(uint8_t x, uint8_t y);
#endif
void draw_compass(uint8_t x, uint8_t y);
void draw_wind(uint8_t x, uint8_t y);
void draw_aspeed(uint8_t x, uint8_t y);

15
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -715,7 +715,8 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = {
// @Description: Vertical position on screen
// @Range: 0 15
AP_SUBGROUPINFO(clk, "CLK", 43, AP_OSD_Screen, AP_OSD_Setting),
#if HAL_OSD_SIDEBAR_ENABLE || HAL_MSP_ENABLED
// @Param: SIDEBARS_EN
// @DisplayName: SIDEBARS_EN
// @Description: Displays artificial horizon side bars
@ -731,6 +732,7 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = {
// @Description: Vertical position on screen
// @Range: 0 15
AP_SUBGROUPINFO(sidebars, "SIDEBARS", 44, AP_OSD_Screen, AP_OSD_Setting),
#endif
#if HAL_MSP_ENABLED
// @Param: CRSSHAIR_EN
@ -1399,7 +1401,6 @@ void AP_OSD_Screen::draw_batused(uint8_t x, uint8_t y)
//Thanks to night-ghost for the approach.
void AP_OSD_Screen::draw_message(uint8_t x, uint8_t y)
{
x = 2; //messages get rendered across a whole row. User param x is ignored.
AP_Notify * notify = AP_Notify::get_singleton();
if (notify) {
int32_t visible_time = AP_HAL::millis() - notify->get_text_updated_millis();
@ -1443,9 +1444,6 @@ void AP_OSD_Screen::draw_message(uint8_t x, uint8_t y)
//trim invisible part
buffer[end_position] = 0;
} else if (len < message_visible_width) {
//for short messages, start writing closer to the middle to center the text
x += (message_visible_width - len)/2;
}
backend->write(x, y, buffer + start_position);
@ -1589,6 +1587,8 @@ void AP_OSD_Screen::draw_throttle(uint8_t x, uint8_t y)
backend->write(x, y, false, "%3d%c", gcs().get_hud_throttle(), SYMBOL(SYM_PCNT));
}
#if HAL_OSD_SIDEBAR_ENABLE
void AP_OSD_Screen::draw_sidebars(uint8_t x, uint8_t y)
{
const int8_t total_sectors = 18;
@ -1652,6 +1652,8 @@ void AP_OSD_Screen::draw_sidebars(uint8_t x, uint8_t y)
}
}
#endif // HAL_OSD_SIDEBAR_ENABLE
//Thanks to betaflight/inav for simple and clean compass visual design
void AP_OSD_Screen::draw_compass(uint8_t x, uint8_t y)
{
@ -2151,7 +2153,10 @@ void AP_OSD_Screen::draw(void)
//Note: draw order should be optimized.
//Big and less important items should be drawn first,
//so they will not overwrite more important ones.
#if HAL_OSD_SIDEBAR_ENABLE
DRAW_SETTING(sidebars);
#endif
DRAW_SETTING(message);
DRAW_SETTING(horizon);
DRAW_SETTING(compass);