Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-20 07:38:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sub: integrate camera frontend/backend split

Browse Source
This commit is contained in:
Randy Mackay 2023-02-14 13:04:04 +09:00 committed by Andrew Tridgell
parent d9795d3580
commit e9d9326410
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduSub/Parameters.cpp
View File

@ -404,9 +404,9 @@ const AP_Param::Info Sub::var_info[] = {
// variables not in the g class which contain EEPROM saved variables // variables not in the g class which contain EEPROM saved variables
#if AP_CAMERA_ENABLED #if AP_CAMERA_ENABLED
// @Group: CAM_ // @Group: CAM
// @Path: ../libraries/AP_Camera/AP_Camera.cpp // @Path: ../libraries/AP_Camera/AP_Camera.cpp
GOBJECT(camera, "CAM_", AP_Camera), GOBJECT(camera, "CAM", AP_Camera),
#endif #endif
// @Group: RELAY_ // @Group: RELAY_

5
ArduSub/system.cpp
View File

@ -103,6 +103,11 @@ void Sub::init_ardupilot()
camera_mount.set_mode(MAV_MOUNT_MODE_RC_TARGETING); camera_mount.set_mode(MAV_MOUNT_MODE_RC_TARGETING);
#endif #endif
#if AP_CAMERA_ENABLED
// initialise camera
camera.init();
#endif
#ifdef USERHOOK_INIT #ifdef USERHOOK_INIT
USERHOOK_INIT USERHOOK_INIT
#endif #endif