Browse Source

Rover: allow OSD for TX-only screens

zr-v5.1
Andy Piper 4 years ago committed by Andrew Tridgell
parent
commit
bfd24ea789
  1. 2
      Rover/Parameters.cpp
  2. 4
      Rover/Rover.h

2
Rover/Parameters.cpp

@ -369,7 +369,7 @@ const AP_Param::Info Rover::var_info[] = {
// @Path: Parameters.cpp // @Path: Parameters.cpp
GOBJECT(g2, "", ParametersG2), GOBJECT(g2, "", ParametersG2),
#if OSD_ENABLED == 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
Rover/Rover.h

@ -165,7 +165,7 @@ private:
OpticalFlow optflow; OpticalFlow optflow;
#endif #endif
#if OSD_ENABLED == ENABLED #if OSD_ENABLED || OSD_PARAM_ENABLED
AP_OSD osd; AP_OSD osd;
#endif #endif
@ -390,7 +390,7 @@ private:
bool should_log(uint32_t mask); bool should_log(uint32_t mask);
bool is_boat() const; bool is_boat() const;
#if OSD_ENABLED == ENABLED #if OSD_ENABLED || OSD_PARAM_ENABLED
void publish_osd_info(); void publish_osd_info();
#endif #endif

Loading…
Cancel
Save