camera trigger : master rebase

This commit is contained in:
Mohammed Kabir
2015-06-03 11:48:37 +05:30
parent df037d97c1
commit 72e2224d1e
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -49,6 +49,7 @@ uint32 VEHICLE_CMD_OVERRIDE_GOTO = 252 # Hold / continue the current action |M
uint32 VEHICLE_CMD_MISSION_START = 300 # start running a mission |first_item: the first mission item to run| last_item: the last mission item to run (after this item is run, the mission ends)| uint32 VEHICLE_CMD_MISSION_START = 300 # start running a mission |first_item: the first mission item to run| last_item: the last mission item to run (after this item is run, the mission ends)|
uint32 VEHICLE_CMD_COMPONENT_ARM_DISARM = 400 # Arms / Disarms a component |1 to arm, 0 to disarm| uint32 VEHICLE_CMD_COMPONENT_ARM_DISARM = 400 # Arms / Disarms a component |1 to arm, 0 to disarm|
uint32 VEHICLE_CMD_START_RX_PAIR = 500 # Starts receiver pairing |0:Spektrum| 0:Spektrum DSM2, 1:Spektrum DSMX| uint32 VEHICLE_CMD_START_RX_PAIR = 500 # Starts receiver pairing |0:Spektrum| 0:Spektrum DSM2, 1:Spektrum DSMX|
uint32 VEHICLE_CMD_DO_TRIGGER_CONTROL = 2003 # Enable or disable on-board camera triggering system
uint32 VEHICLE_CMD_PAYLOAD_PREPARE_DEPLOY = 30001 # Prepare a payload deployment in the flight plan uint32 VEHICLE_CMD_PAYLOAD_PREPARE_DEPLOY = 30001 # Prepare a payload deployment in the flight plan
uint32 VEHICLE_CMD_PAYLOAD_CONTROL_DEPLOY = 30002 # Control a pre-programmed payload deployment uint32 VEHICLE_CMD_PAYLOAD_CONTROL_DEPLOY = 30002 # Control a pre-programmed payload deployment
@@ -151,7 +151,7 @@ CameraTrigger::CameraTrigger() :
_trigger_enabled(true), _trigger_enabled(true),
_sensor_sub(-1), _sensor_sub(-1),
_vcommand_sub(-1), _vcommand_sub(-1),
_trigger_pub(-1), _trigger_pub(nullptr),
_trigger{} _trigger{}
{ {
memset(&_trigger, 0, sizeof(_trigger)); memset(&_trigger, 0, sizeof(_trigger));