Browse Source

Copter: allow OSD for TX-only screens

zr-v5.1
Andy Piper 4 years ago committed by Andrew Tridgell
parent
commit
304d05f918
  1. 4
      ArduCopter/Copter.h
  2. 2
      ArduCopter/Parameters.cpp

4
ArduCopter/Copter.h

@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
# include <AP_Button/AP_Button.h>
#endif
#if OSD_ENABLED == ENABLED
#if OSD_ENABLED || OSD_PARAM_ENABLED
#include <AP_OSD/AP_OSD.h>
#endif
@ -442,7 +442,7 @@ private: @@ -442,7 +442,7 @@ private:
FUNCTOR_BIND_MEMBER(&Copter::handle_battery_failsafe, void, const char*, const int8_t),
_failsafe_priorities};
#if OSD_ENABLED == ENABLED
#if OSD_ENABLED || OSD_PARAM_ENABLED
AP_OSD osd;
#endif

2
ArduCopter/Parameters.cpp

@ -709,7 +709,7 @@ const AP_Param::Info Copter::var_info[] = { @@ -709,7 +709,7 @@ const AP_Param::Info Copter::var_info[] = {
// @User: Standard
GSCALAR(rtl_alt_type, "RTL_ALT_TYPE", 0),
#if OSD_ENABLED == ENABLED
#if OSD_ENABLED || OSD_PARAM_ENABLED
// @Group: OSD
// @Path: ../libraries/AP_OSD/AP_OSD.cpp
GOBJECT(osd, "OSD", AP_OSD),

Loading…
Cancel
Save