Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-11 17:13:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

RC_Channel: integrate AP_CAMERA_SET_CAMERA_SOURCE_ENABLED

Browse Source
This commit is contained in:
Randy Mackay 2024-03-23 09:04:26 +09:00
parent 3a570943d5
commit e9cffbb56e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/RC_Channel/RC_Channel.cpp
View File

@ -1004,14 +1004,18 @@ bool RC_Channel::do_aux_function_camera_image_tracking(const AuxSwitchPos ch_fla
bool RC_Channel::do_aux_function_camera_lens(const AuxSwitchPos ch_flag) bool RC_Channel::do_aux_function_camera_lens(const AuxSwitchPos ch_flag)
{ {
#if AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
AP_Camera *camera = AP::camera(); AP_Camera *camera = AP::camera();
if (camera == nullptr) { if (camera == nullptr) {
return false; return false;
} }
// Low selects lens 0 (default), Mediums selects lens1, High selects lens2 // Low selects lens 0 (default), Mediums selects lens1, High selects lens2
return camera->set_lens((uint8_t)ch_flag); return camera->set_lens((uint8_t)ch_flag);
#else
return false;
#endif // AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
} }
#endif #endif // AP_CAMERA_ENABLED
void RC_Channel::do_aux_function_runcam_control(const AuxSwitchPos ch_flag) void RC_Channel::do_aux_function_runcam_control(const AuxSwitchPos ch_flag)
{ {
@ -1526,9 +1530,11 @@ bool RC_Channel::do_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos ch
case AUX_FUNC::CAMERA_IMAGE_TRACKING: case AUX_FUNC::CAMERA_IMAGE_TRACKING:
return do_aux_function_camera_image_tracking(ch_flag); return do_aux_function_camera_image_tracking(ch_flag);
#if AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
case AUX_FUNC::CAMERA_LENS: case AUX_FUNC::CAMERA_LENS:
return do_aux_function_camera_lens(ch_flag); return do_aux_function_camera_lens(ch_flag);
#endif #endif // AP_CAMERA_SET_CAMERA_SOURCE_ENABLED
#endif // AP_CAMERA_ENABLED
#if HAL_MOUNT_ENABLED #if HAL_MOUNT_ENABLED
case AUX_FUNC::RETRACT_MOUNT1: { case AUX_FUNC::RETRACT_MOUNT1: {