fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 00:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

camera_capture: add cycle for cycle_trampoline

Browse Source
This commit is contained in:
DanielePettenuzzo
2019-02-10 18:07:44 -05:00
committed by Daniel Agar
parent ea9d6899ae
commit 38c8a6ff74
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/camera_capture/camera_capture.cpp
+18 -12
View File
@@ -129,37 +129,43 @@ CameraCapture::capture_trampoline(void *context, uint32_t chan_index,
void void
CameraCapture::cycle_trampoline(void *arg) CameraCapture::cycle_trampoline(void *arg)
{ {
CameraCapture *dev = reinterpret_cast<CameraCapture *>(arg);
CameraCapture *cap = reinterpret_cast<CameraCapture *>(arg); dev->cycle();
}
if (cap->_command_sub < 0) { void
cap->_command_sub = orb_subscribe(ORB_ID(vehicle_command)); CameraCapture::cycle()
{
if (_command_sub < 0) {
_command_sub = orb_subscribe(ORB_ID(vehicle_command));
} }
bool updated = false; bool updated = false;
orb_check(cap->_command_sub, &updated); orb_check(_command_sub, &updated);
// Command handling // Command handling
if (updated) { if (updated) {
vehicle_command_s cmd; vehicle_command_s cmd;
orb_copy(ORB_ID(vehicle_command), cap->_command_sub, &cmd); orb_copy(ORB_ID(vehicle_command), _command_sub, &cmd);
// TODO : this should eventuallly be a capture control command // TODO : this should eventuallly be a capture control command
if (cmd.command == vehicle_command_s::VEHICLE_CMD_DO_TRIGGER_CONTROL) { if (cmd.command == vehicle_command_s::VEHICLE_CMD_DO_TRIGGER_CONTROL) {
// Enable/disable signal capture // Enable/disable signal capture
if (commandParamToInt(cmd.param1) == 1) { if (commandParamToInt(cmd.param1) == 1) {
cap->set_capture_control(true); set_capture_control(true);
} else if (commandParamToInt(cmd.param1) == 0) { } else if (commandParamToInt(cmd.param1) == 0) {
cap->set_capture_control(false); set_capture_control(false);
} }
// Reset capture sequence // Reset capture sequence
if (commandParamToInt(cmd.param2) == 1) { if (commandParamToInt(cmd.param2) == 1) {
cap->reset_statistics(true); reset_statistics(true);
} }
@@ -175,12 +181,12 @@ CameraCapture::cycle_trampoline(void *arg)
.target_component = cmd.source_component .target_component = cmd.source_component
}; };
if (cap->_command_ack_pub == nullptr) { if (_command_ack_pub == nullptr) {
cap->_command_ack_pub = orb_advertise_queue(ORB_ID(vehicle_command_ack), &command_ack, _command_ack_pub = orb_advertise_queue(ORB_ID(vehicle_command_ack), &command_ack,
vehicle_command_ack_s::ORB_QUEUE_LENGTH); vehicle_command_ack_s::ORB_QUEUE_LENGTH);
} else { } else {
orb_publish(ORB_ID(vehicle_command_ack), cap->_command_ack_pub, &command_ack); orb_publish(ORB_ID(vehicle_command_ack), _command_ack_pub, &command_ack);
} }
} }
src/drivers/camera_capture/camera_capture.hpp
+2
View File
@@ -87,6 +87,8 @@ public:
void status(); void status();
void cycle();
static void capture_trampoline(void *context, uint32_t chan_index, static void capture_trampoline(void *context, uint32_t chan_index,
hrt_abstime edge_time, uint32_t edge_state, hrt_abstime edge_time, uint32_t edge_state,
uint32_t overflow); uint32_t overflow);