From cfba41d2f47f248871e6c660a790686161ec14bf Mon Sep 17 00:00:00 2001 From: RomanBapst Date: Wed, 24 Jul 2019 10:57:18 +0200 Subject: [PATCH] posix configs: set trigger interface to mavlink as it's the only one supported on posix Signed-off-by: RomanBapst --- ROMFS/px4fmu_common/init.d-posix/rcS | 2 ++ src/drivers/camera_trigger/camera_trigger.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ROMFS/px4fmu_common/init.d-posix/rcS b/ROMFS/px4fmu_common/init.d-posix/rcS index d0b3e248c1..86e0ccc423 100644 --- a/ROMFS/px4fmu_common/init.d-posix/rcS +++ b/ROMFS/px4fmu_common/init.d-posix/rcS @@ -162,6 +162,8 @@ then param set SENS_DPRES_OFF 0.001 param set SYS_RESTART_TYPE 2 + param set TRIG_INTERFACE 3 + param set WEST_EN 0 fi diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp index ad6756a10f..2174e986ef 100644 --- a/src/drivers/camera_trigger/camera_trigger.cpp +++ b/src/drivers/camera_trigger/camera_trigger.cpp @@ -329,7 +329,9 @@ CameraTrigger::CameraTrigger() : CameraTrigger::~CameraTrigger() { - delete (_camera_interface); + if (_camera_interface != nullptr) { + delete (_camera_interface); + } camera_trigger::g_camera_trigger = nullptr; } @@ -433,6 +435,8 @@ CameraTrigger::start() if (_camera_interface == nullptr) { if (camera_trigger::g_camera_trigger != nullptr) { delete (camera_trigger::g_camera_trigger); + camera_trigger::g_camera_trigger = nullptr; + } return false; @@ -482,6 +486,7 @@ CameraTrigger::stop() if (camera_trigger::g_camera_trigger != nullptr) { delete (camera_trigger::g_camera_trigger); + camera_trigger::g_camera_trigger = nullptr; } }