From 21ea27f7f69b9804527f450197dcf165981a35d2 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 21 Mar 2018 14:12:54 -0400 Subject: [PATCH] camera_trigger replace math::Vector with matrix::Vector --- src/drivers/camera_trigger/camera_trigger.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp index eef46e5655..a61b50f5e8 100644 --- a/src/drivers/camera_trigger/camera_trigger.cpp +++ b/src/drivers/camera_trigger/camera_trigger.cpp @@ -169,7 +169,7 @@ private: bool _one_shot; bool _test_shot; bool _turning_on; - math::Vector<2> _last_shoot_position; + matrix::Vector2f _last_shoot_position; bool _valid_position; int _command_sub; @@ -366,7 +366,7 @@ CameraTrigger::update_distance() if (local.xy_valid) { // Initialize position if not done yet - math::Vector<2> current_position(local.x, local.y); + matrix::Vector2f current_position(local.x, local.y); if (!_valid_position) { // First time valid position, take first shot @@ -376,7 +376,7 @@ CameraTrigger::update_distance() } // Check that distance threshold is exceeded - if ((_last_shoot_position - current_position).length() >= _distance) { + if (matrix::Vector2f(_last_shoot_position - current_position).length() >= _distance) { shoot_once(); _last_shoot_position = current_position;