yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 09:28:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the triggering function logic

Browse Source 
Conflicts:
	PX4/src/drivers/camera_trigger/camera_trigger.cpp
	PX4/src/drivers/camera_trigger/interfaces/src/camera_interface.h
	PX4/src/drivers/camera_trigger/interfaces/src/pwm.cpp
	PX4/src/drivers/camera_trigger/interfaces/src/pwm.h
	PX4/src/drivers/camera_trigger/interfaces/src/relay.cpp
	PX4/src/drivers/camera_trigger/interfaces/src/relay.h
This commit is contained in:
Kelly Steich
2016-06-10 11:23:09 +02:00
committed by Lorenz Meier
parent b31c346ea7
commit 29f31ae6ac
6 changed files with 240 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,7 +426,11 @@ CameraTrigger::engage(void *arg)
/* set timestamp the instant before the trigger goes off */
report.timestamp = hrt_absolute_time();
<<<<<<< HEAD
CameraTrigger::trigger(trig, trig->_polarity);
=======
trig->_camera_interface->trigger(true);
>>>>>>> fb669fc... fixed the triggering function logic
report.seq = trig->_trigger_seq++;
@@ -436,10 +440,16 @@ CameraTrigger::engage(void *arg)
void
CameraTrigger::disengage(void *arg)
{
<<<<<<< HEAD
CameraTrigger *trig = reinterpret_cast<CameraTrigger *>(arg);
CameraTrigger::trigger(trig, !(trig->_polarity));
=======
CameraTrigger *trig = reinterpret_cast<CameraTrigger *>(arg);
trig->_camera_interface->trigger(false);
>>>>>>> fb669fc... fixed the triggering function logic
}
void