From 958622523f5acb870b0d7983579f7c4d98615366 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 21 Jun 2023 16:03:39 +1000 Subject: [PATCH] AP_Mission: add and use SetFocusResult --- libraries/AP_Mission/AP_Mission_Commands.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Mission/AP_Mission_Commands.cpp b/libraries/AP_Mission/AP_Mission_Commands.cpp index aa2da85dc9..484b1c51c3 100644 --- a/libraries/AP_Mission/AP_Mission_Commands.cpp +++ b/libraries/AP_Mission/AP_Mission_Commands.cpp @@ -150,15 +150,15 @@ bool AP_Mission::start_command_camera(const AP_Mission::Mission_Command& cmd) if ((cmd.content.set_camera_focus.focus_type == FOCUS_TYPE_AUTO) || (cmd.content.set_camera_focus.focus_type == FOCUS_TYPE_AUTO_SINGLE) || (cmd.content.set_camera_focus.focus_type == FOCUS_TYPE_AUTO_CONTINUOUS)) { - return camera->set_focus(FocusType::AUTO, 0); + return camera->set_focus(FocusType::AUTO, 0) == SetFocusResult::ACCEPTED; } // accept continuous manual focus if (cmd.content.set_camera_focus.focus_type == FOCUS_TYPE_CONTINUOUS) { - return camera->set_focus(FocusType::RATE, cmd.content.set_camera_focus.focus_value); + return camera->set_focus(FocusType::RATE, cmd.content.set_camera_focus.focus_value) == SetFocusResult::ACCEPTED; } // accept range manual focus if (cmd.content.set_camera_focus.focus_type == FOCUS_TYPE_RANGE) { - return camera->set_focus(FocusType::PCT, cmd.content.set_camera_focus.focus_value); + return camera->set_focus(FocusType::PCT, cmd.content.set_camera_focus.focus_value) == SetFocusResult::ACCEPTED; } return false;