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

AP_OSD: add wind speed/direction item

This commit is contained in:
Alexander Malishev 2018-07-04 01:50:05 +04:00 committed by Andrew Tridgell
parent 90d6922de5
commit 1514a96bcb
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_OSD/AP_OSD.h
View File

@ -88,6 +88,7 @@ private:
AP_OSD_Setting throttle{false, 0, 0}; AP_OSD_Setting throttle{false, 0, 0};
AP_OSD_Setting heading{false, 0, 0}; AP_OSD_Setting heading{false, 0, 0};
AP_OSD_Setting compass{false, 0, 0}; AP_OSD_Setting compass{false, 0, 0};
AP_OSD_Setting wind{false, 0, 0};
void draw_altitude(uint8_t x, uint8_t y); void draw_altitude(uint8_t x, uint8_t y);
void draw_bat_volt(uint8_t x, uint8_t y); void draw_bat_volt(uint8_t x, uint8_t y);
@ -103,6 +104,9 @@ private:
void draw_throttle(uint8_t x, uint8_t y); void draw_throttle(uint8_t x, uint8_t y);
void draw_heading(uint8_t x, uint8_t y); void draw_heading(uint8_t x, uint8_t y);
void draw_compass(uint8_t x, uint8_t y); void draw_compass(uint8_t x, uint8_t y);
void draw_wind(uint8_t x, uint8_t y);
void draw_speed_vector(uint8_t x, uint8_t y, Vector2f v);
}; };
class AP_OSD { class AP_OSD {

25
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -108,7 +108,11 @@ const AP_Param::GroupInfo AP_OSD_Screen::var_info[] = {
//@Group: COMPASS //@Group: COMPASS
//@Path: AP_OSD_Setting.cpp //@Path: AP_OSD_Setting.cpp
AP_SUBGROUPINFO(throttle, "COMPASS", 17, AP_OSD_Screen, AP_OSD_Setting), AP_SUBGROUPINFO(compass, "COMPASS", 17, AP_OSD_Screen, AP_OSD_Setting),
//@Group: WIND
//@Path: AP_OSD_Setting.cpp
AP_SUBGROUPINFO(wind, "WIND", 18, AP_OSD_Screen, AP_OSD_Setting),
AP_GROUPEND AP_GROUPEND
}; };
@ -141,6 +145,7 @@ AP_OSD_Screen::AP_OSD_Screen()
#define SYM_SAT_R 0x1F #define SYM_SAT_R 0x1F
#define SYM_HOME 0xBF #define SYM_HOME 0xBF
#define SYM_WIND 0x16
#define SYM_ARROW_START 0x60 #define SYM_ARROW_START 0x60
#define SYM_ARROW_COUNT 16 #define SYM_ARROW_COUNT 16
@ -261,9 +266,8 @@ void AP_OSD_Screen::draw_message(uint8_t x, uint8_t y)
} }
} }
void AP_OSD_Screen::draw_gspeed(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_speed_vector(uint8_t x, uint8_t y,Vector2f v)
{ {
Vector2f v = AP::ahrs().groundspeed_vector();
float v_length = v.length(); float v_length = v.length();
char arrow = SYM_ARROW_START; char arrow = SYM_ARROW_START;
if (v_length > 1.0f) { if (v_length > 1.0f) {
@ -274,6 +278,13 @@ void AP_OSD_Screen::draw_gspeed(uint8_t x, uint8_t y)
backend->write(x, y, false, "%c%3.0f%c", arrow, v_length * 3.6, SYM_KMH); backend->write(x, y, false, "%c%3.0f%c", arrow, v_length * 3.6, SYM_KMH);
} }
void AP_OSD_Screen::draw_gspeed(uint8_t x, uint8_t y)
{
Vector2f v = AP::ahrs().groundspeed_vector();
backend->write(x, y, false, "V");
draw_speed_vector(x + 1, y, v);
}
//Thanks to betaflight/inav for simple and clean artificial horizon visual design //Thanks to betaflight/inav for simple and clean artificial horizon visual design
void AP_OSD_Screen::draw_horizon(uint8_t x, uint8_t y) void AP_OSD_Screen::draw_horizon(uint8_t x, uint8_t y)
{ {
@ -368,6 +379,13 @@ void AP_OSD_Screen::draw_compass(uint8_t x, uint8_t y)
} }
} }
void AP_OSD_Screen::draw_wind(uint8_t x, uint8_t y)
{
Vector3f v = AP::ahrs().wind_estimate();
backend->write(x, y, "%c", SYM_WIND);
draw_speed_vector(x + 1, y, Vector2f(v.x, v.y));
}
#define DRAW_SETTING(n) if (n.enabled) draw_ ## n(n.xpos, n.ypos) #define DRAW_SETTING(n) if (n.enabled) draw_ ## n(n.xpos, n.ypos)
void AP_OSD_Screen::draw(void) void AP_OSD_Screen::draw(void)
@ -392,5 +410,6 @@ void AP_OSD_Screen::draw(void)
DRAW_SETTING(gspeed); DRAW_SETTING(gspeed);
DRAW_SETTING(throttle); DRAW_SETTING(throttle);
DRAW_SETTING(heading); DRAW_SETTING(heading);
DRAW_SETTING(wind);
DRAW_SETTING(home); DRAW_SETTING(home);
} }