dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

camera_trigger replace math::Vector with matrix::Vector

This commit is contained in:
Daniel Agar 2018-03-21 14:12:54 -04:00 committed by Kabir Mohammed
parent 5b6fda2e4b
commit 21ea27f7f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/camera_trigger/camera_trigger.cpp
View File

@ -169,7 +169,7 @@ private:
bool _one_shot; bool _one_shot;
bool _test_shot; bool _test_shot;
bool _turning_on; bool _turning_on;
math::Vector<2> _last_shoot_position; matrix::Vector2f _last_shoot_position;
bool _valid_position; bool _valid_position;
int _command_sub; int _command_sub;
@ -366,7 +366,7 @@ CameraTrigger::update_distance()
if (local.xy_valid) { if (local.xy_valid) {
// Initialize position if not done yet // 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) { if (!_valid_position) {
// First time valid position, take first shot // First time valid position, take first shot
@ -376,7 +376,7 @@ CameraTrigger::update_distance()
} }
// Check that distance threshold is exceeded // 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(); shoot_once();
_last_shoot_position = current_position; _last_shoot_position = current_position;