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

Plane: allow OSD for TX-only screens

Browse Source
This commit is contained in:
Andy Piper 2020-10-28 19:39:13 +00:00 committed by Andrew Tridgell
parent 304d05f918
commit fa454da315
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/Parameters.cpp
View File

@ -1085,7 +1085,7 @@ const AP_Param::Info Plane::var_info[] = {
// @Path: ../libraries/AP_Landing/AP_Landing.cpp // @Path: ../libraries/AP_Landing/AP_Landing.cpp
GOBJECT(landing, "LAND_", AP_Landing), GOBJECT(landing, "LAND_", AP_Landing),
#if OSD_ENABLED #if OSD_ENABLED || OSD_PARAM_ENABLED
// @Group: OSD // @Group: OSD
// @Path: ../libraries/AP_OSD/AP_OSD.cpp // @Path: ../libraries/AP_OSD/AP_OSD.cpp
GOBJECT(osd, "OSD", AP_OSD), GOBJECT(osd, "OSD", AP_OSD),

4
ArduPlane/Plane.h
View File

@ -253,7 +253,7 @@ private:
// Rally Ponints // Rally Ponints
AP_Rally rally; AP_Rally rally;
#if OSD_ENABLED == ENABLED #if OSD_ENABLED || OSD_PARAM_ENABLED
AP_OSD osd; AP_OSD osd;
#endif #endif
@ -974,7 +974,7 @@ private:
void update_control_mode(void); void update_control_mode(void);
void update_flight_stage(); void update_flight_stage();
void set_flight_stage(AP_Vehicle::FixedWing::FlightStage fs); void set_flight_stage(AP_Vehicle::FixedWing::FlightStage fs);
#if OSD_ENABLED == ENABLED #if OSD_ENABLED || OSD_PARAM_ENABLED
void publish_osd_info(); void publish_osd_info();
#endif #endif