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

Copter: added OSD support

Browse Source
This commit is contained in:
Alexander Malishev 2018-06-23 17:11:05 +10:00 committed by Andrew Tridgell
parent c1d82a43c5
commit f63b3c044a
7 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Copter.h
View File

@ -152,6 +152,10 @@
#include <AP_Devo_Telem/AP_Devo_Telem.h> #include <AP_Devo_Telem/AP_Devo_Telem.h>
#endif #endif
#if OSD_ENABLED == ENABLED
#include <AP_OSD/AP_OSD.h>
#endif
#if ADVANCED_FAILSAFE == ENABLED #if ADVANCED_FAILSAFE == ENABLED
# include "afs_copter.h" # include "afs_copter.h"
#endif #endif

6
ArduCopter/Parameters.cpp
View File

@ -980,6 +980,12 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
AP_SUBGROUPINFO(follow, "FOLL", 27, ParametersG2, AP_Follow), AP_SUBGROUPINFO(follow, "FOLL", 27, ParametersG2, AP_Follow),
#endif #endif
#if OSD_ENABLED
// @Group: OSD
// @Path: ../libraries/AP_OSD/AP_OSD.cpp
AP_SUBGROUPINFO(osd, "OSD_", 28, ParametersG2, AP_OSD),
#endif
AP_GROUPEND AP_GROUPEND
}; };

5
ArduCopter/Parameters.h
View File

@ -585,6 +585,11 @@ public:
// follow // follow
AP_Follow follow; AP_Follow follow;
#endif #endif
#if OSD_ENABLED == ENABLED
AP_OSD osd;
#endif
}; };
extern const AP_Param::Info var_info[]; extern const AP_Param::Info var_info[];

4
ArduCopter/config.h
View File

@ -728,3 +728,7 @@
#define DEVO_TELEM_ENABLED ENABLED #define DEVO_TELEM_ENABLED ENABLED
#endif #endif
#endif #endif
#ifndef OSD_ENABLED
#define OSD_ENABLED DISABLED
#endif

1
ArduCopter/make.inc
View File

@ -65,3 +65,4 @@ LIBRARIES += AP_Winch
LIBRARIES += AP_WheelEncoder LIBRARIES += AP_WheelEncoder
LIBRARIES += AP_Follow LIBRARIES += AP_Follow
LIBRARIES += AP_Devo_Telem LIBRARIES += AP_Devo_Telem
LIBRARIES += AP_OSD

4
ArduCopter/system.cpp
View File

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

1
ArduCopter/wscript
View File

@ -34,6 +34,7 @@ def build(bld):
'AP_Winch', 'AP_Winch',
'AP_Follow', 'AP_Follow',
'AP_Devo_Telem', 'AP_Devo_Telem',
'AP_OSD',
], ],
) )