Browse Source

Plane: added OSD support

master
Alexander Malishev 7 years ago committed by Andrew Tridgell
parent
commit
75bf6984f5
  1. 6
      ArduPlane/Parameters.cpp
  2. 4
      ArduPlane/Parameters.h
  3. 1
      ArduPlane/Plane.h
  4. 5
      ArduPlane/config.h
  5. 1
      ArduPlane/make.inc
  6. 4
      ArduPlane/system.cpp
  7. 1
      ArduPlane/wscript

6
ArduPlane/Parameters.cpp

@ -1169,6 +1169,12 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = { @@ -1169,6 +1169,12 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
AP_SUBGROUPINFO(gripper, "GRIP_", 12, ParametersG2, AP_Gripper),
#endif
#if OSD_ENABLED
// @Group: OSD
// @Path: ../libraries/AP_OSD/AP_OSD.cpp
AP_SUBGROUPINFO(osd, "OSD_", 13, ParametersG2, AP_OSD),
#endif
AP_GROUPEND
};

4
ArduPlane/Parameters.h

@ -542,6 +542,10 @@ public: @@ -542,6 +542,10 @@ public:
AP_Gripper gripper;
#endif
#if OSD_ENABLED == ENABLED
AP_OSD osd;
#endif
};
extern const AP_Param::Info var_info[];

1
ArduPlane/Plane.h

@ -85,6 +85,7 @@ @@ -85,6 +85,7 @@
#include <AP_BoardConfig/AP_BoardConfig_CAN.h>
#include <AP_Frsky_Telem/AP_Frsky_Telem.h>
#include <AP_Devo_Telem/AP_Devo_Telem.h>
#include <AP_OSD/AP_OSD.h>
#include <AP_ServoRelayEvents/AP_ServoRelayEvents.h>
#include <AP_Rally/AP_Rally.h>

5
ArduPlane/config.h

@ -373,3 +373,8 @@ @@ -373,3 +373,8 @@
#define DEVO_TELEM_ENABLED ENABLED
#endif
#endif
#ifndef OSD_ENABLED
#define OSD_ENABLED DISABLED
#endif

1
ArduPlane/make.inc

@ -58,3 +58,4 @@ LIBRARIES += AP_Beacon @@ -58,3 +58,4 @@ LIBRARIES += AP_Beacon
LIBRARIES += PID
LIBRARIES += AP_Soaring
LIBRARIES += AP_Devo_Telem
LIBRARIES += AP_OSD

4
ArduPlane/system.cpp

@ -122,6 +122,10 @@ void Plane::init_ardupilot() @@ -122,6 +122,10 @@ void Plane::init_ardupilot()
devo_telemetry.init(serial_manager);
#endif
#if OSD_ENABLED == ENABLED
g2.osd.init();
#endif
#if LOGGING_ENABLED == ENABLED
log_init();
#endif

1
ArduPlane/wscript

@ -32,6 +32,7 @@ def build(bld): @@ -32,6 +32,7 @@ def build(bld):
'PID',
'AP_Soaring',
'AP_Devo_Telem',
'AP_OSD',
],
)

Loading…
Cancel
Save