Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArduPlane: add and use AP_CAMERA_ENABLED

This commit is contained in:
Peter Barker 2022-06-02 18:28:26 +10:00 committed by Peter Barker
parent fd28991ab2
commit dabf78c61f
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/ArduPlane.cpp
View File

@ -97,7 +97,7 @@ const AP_Scheduler::Task Plane::scheduler_tasks[] = {
#if HAL_MOUNT_ENABLED #if HAL_MOUNT_ENABLED
SCHED_TASK_CLASS(AP_Mount, &plane.camera_mount, update, 50, 100, 105), SCHED_TASK_CLASS(AP_Mount, &plane.camera_mount, update, 50, 100, 105),
#endif // HAL_MOUNT_ENABLED #endif // HAL_MOUNT_ENABLED
#if CAMERA == ENABLED #if AP_CAMERA_ENABLED
SCHED_TASK_CLASS(AP_Camera, &plane.camera, update, 50, 100, 108), SCHED_TASK_CLASS(AP_Camera, &plane.camera, update, 50, 100, 108),
#endif // CAMERA == ENABLED #endif // CAMERA == ENABLED
SCHED_TASK_CLASS(AP_Scheduler, &plane.scheduler, update_logging, 0.2, 100, 111), SCHED_TASK_CLASS(AP_Scheduler, &plane.scheduler, update_logging, 0.2, 100, 111),

2
ArduPlane/Parameters.cpp
View File

@ -746,7 +746,7 @@ const AP_Param::Info Plane::var_info[] = {
// @Path: ../libraries/AP_GPS/AP_GPS.cpp // @Path: ../libraries/AP_GPS/AP_GPS.cpp
GOBJECT(gps, "GPS", AP_GPS), GOBJECT(gps, "GPS", AP_GPS),
#if 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),

2
ArduPlane/Plane.h
View File

@ -236,7 +236,7 @@ private:
AP_Navigation *nav_controller = &L1_controller; AP_Navigation *nav_controller = &L1_controller;
// Camera // Camera
#if CAMERA == ENABLED #if AP_CAMERA_ENABLED
AP_Camera camera{MASK_LOG_CAMERA}; AP_Camera camera{MASK_LOG_CAMERA};
#endif #endif

7
ArduPlane/config.h
View File

@ -111,13 +111,6 @@
#define DSPOILR_RUD_RATE_DEFAULT 100 #define DSPOILR_RUD_RATE_DEFAULT 100
#endif #endif
//////////////////////////////////////////////////////////////////////////////
// CAMERA TRIGGER AND CONTROL
//
#ifndef CAMERA
# define CAMERA ENABLED
#endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// FLIGHT AND NAVIGATION CONTROL // FLIGHT AND NAVIGATION CONTROL

2
ArduPlane/mode.cpp
View File

@ -53,7 +53,7 @@ bool Mode::enter()
plane.guided_state.last_target_alt = 0; plane.guided_state.last_target_alt = 0;
#endif #endif
#if CAMERA == ENABLED #if AP_CAMERA_ENABLED
plane.camera.set_is_auto_mode(this == &plane.mode_auto); plane.camera.set_is_auto_mode(this == &plane.mode_auto);
#endif #endif