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

rename camera capture feedback param and move it from camera_feedback module to camera capture driver

Browse Source
This commit is contained in:
DanielePettenuzzo
2019-02-10 18:07:44 -05:00
committed by Daniel Agar
parent 42afc88285
commit d49752141d
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/camera_capture/camera_capture.cpp
+5 -5
View File
@@ -53,7 +53,7 @@ CameraCapture::CameraCapture() :
_trigger_pub(nullptr),
_command_ack_pub(nullptr),
_command_sub(-1),
_hotshoe_trigger_feedback(false),
_camera_capture_feedback(false),
_capture_seq(0),
_last_fall_time(0),
_last_exposure_time(0),
@@ -66,10 +66,10 @@ CameraCapture::CameraCapture() :
_p_strobe_delay = param_find("CAM_CAP_DELAY");
param_get(_p_strobe_delay, &_strobe_delay);
_p_hotshoe_trigger_feedback = param_find("CAM_HSHOE_FBACK");
param_get(_p_hotshoe_trigger_feedback, &_hotshoe_trigger_feedback);
_p_camera_capture_feedback = param_find("CAM_CAP_FBACK");
param_get(_p_camera_capture_feedback, &_camera_capture_feedback);
if (_hotshoe_trigger_feedback != 0) {
if (_camera_capture_feedback != 0) {
struct camera_trigger_s trigger = {};
_trigger_pub = orb_advertise(ORB_ID(camera_trigger), &trigger);
}
@@ -91,7 +91,7 @@ CameraCapture::capture_callback(uint32_t chan_index,
trigger.timestamp = edge_time - ((edge_time - _last_fall_time) / 2); // Get timestamp of mid-exposure
trigger.seq = _capture_seq++;
if (_hotshoe_trigger_feedback != 0) {
if (_camera_capture_feedback != 0) {
orb_publish(ORB_ID(camera_trigger), _trigger_pub, &trigger);
}
src/drivers/camera_capture/camera_capture.hpp
+2 -2
View File
@@ -112,8 +112,8 @@ private:
// Parameters
param_t _p_strobe_delay;
float _strobe_delay;
param_t _p_hotshoe_trigger_feedback;
int32_t _hotshoe_trigger_feedback;
param_t _p_camera_capture_feedback;
int32_t _camera_capture_feedback;
// Signal capture statistics
uint32_t _capture_seq;
src/drivers/camera_capture/camera_capture_params.c
+11
View File
@@ -49,3 +49,14 @@
* @group Camera Capture
*/
PARAM_DEFINE_FLOAT(CAM_CAP_DELAY, 1.0f);
/**
* Camera capture feedback
*
* Enables camera feedback from hotshoe on camera..
*
* @boolean
* @group Camera Control
* @reboot_required true
*/
PARAM_DEFINE_INT32(CAM_CAP_FBACK, 0);