mirror of https://github.com/ArduPilot/ardupilot
Sub: integrate camera frontend/backend split
This commit is contained in:
parent
d9795d3580
commit
e9d9326410
|
@ -404,9 +404,9 @@ const AP_Param::Info Sub::var_info[] = {
|
|||
// variables not in the g class which contain EEPROM saved variables
|
||||
|
||||
#if AP_CAMERA_ENABLED
|
||||
// @Group: CAM_
|
||||
// @Group: CAM
|
||||
// @Path: ../libraries/AP_Camera/AP_Camera.cpp
|
||||
GOBJECT(camera, "CAM_", AP_Camera),
|
||||
GOBJECT(camera, "CAM", AP_Camera),
|
||||
#endif
|
||||
|
||||
// @Group: RELAY_
|
||||
|
|
|
@ -103,6 +103,11 @@ void Sub::init_ardupilot()
|
|||
camera_mount.set_mode(MAV_MOUNT_MODE_RC_TARGETING);
|
||||
#endif
|
||||
|
||||
#if AP_CAMERA_ENABLED
|
||||
// initialise camera
|
||||
camera.init();
|
||||
#endif
|
||||
|
||||
#ifdef USERHOOK_INIT
|
||||
USERHOOK_INIT
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue