From 2baa4681d2187b089ba041517a51886ce622b4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Sat, 11 Aug 2018 10:51:17 +0200 Subject: [PATCH] camera_feedback: add to SITL config --- cmake/configs/posix_sitl_default.cmake | 1 + src/modules/camera_feedback/camera_feedback.cpp | 3 ++- src/modules/camera_feedback/camera_feedback.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake index a523202659..f333dacc8f 100644 --- a/cmake/configs/posix_sitl_default.cmake +++ b/cmake/configs/posix_sitl_default.cmake @@ -60,6 +60,7 @@ set(config_module_list # # General system control # + modules/camera_feedback modules/commander modules/events #modules/gpio_led diff --git a/src/modules/camera_feedback/camera_feedback.cpp b/src/modules/camera_feedback/camera_feedback.cpp index c7384b6ad0..f3b643fc3c 100644 --- a/src/modules/camera_feedback/camera_feedback.cpp +++ b/src/modules/camera_feedback/camera_feedback.cpp @@ -225,10 +225,11 @@ CameraFeedback::task_main() } -void +int CameraFeedback::task_main_trampoline(int argc, char *argv[]) { camera_feedback::g_camera_feedback->task_main(); + return 0; } static int usage() diff --git a/src/modules/camera_feedback/camera_feedback.hpp b/src/modules/camera_feedback/camera_feedback.hpp index 3c91bd1b46..5ff7c3d5f6 100644 --- a/src/modules/camera_feedback/camera_feedback.hpp +++ b/src/modules/camera_feedback/camera_feedback.hpp @@ -113,6 +113,6 @@ private: /** * Shim for calling task_main from task_create. */ - static void task_main_trampoline(int argc, char *argv[]); + static int task_main_trampoline(int argc, char *argv[]); };