From 714e19e399e71bf0e080a54939120bf3ddb6a8ac Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Tue, 17 Mar 2026 21:55:31 -0800 Subject: [PATCH] refactor(drivers/camera_capture): convert params.c to module.yaml Convert 1 parameter file(s) from legacy C format to YAML module configuration. --- src/drivers/camera_capture/CMakeLists.txt | 2 + .../camera_capture/camera_capture_params.c | 87 ------------------- .../camera_capture/camera_capture_params.yaml | 44 ++++++++++ 3 files changed, 46 insertions(+), 87 deletions(-) delete mode 100644 src/drivers/camera_capture/camera_capture_params.c create mode 100644 src/drivers/camera_capture/camera_capture_params.yaml diff --git a/src/drivers/camera_capture/CMakeLists.txt b/src/drivers/camera_capture/CMakeLists.txt index 37e9e88b86..a3e8f769d2 100644 --- a/src/drivers/camera_capture/CMakeLists.txt +++ b/src/drivers/camera_capture/CMakeLists.txt @@ -44,6 +44,8 @@ px4_add_module( -DPARAM_PREFIX="${PARAM_PREFIX}" SRCS camera_capture.cpp + MODULE_CONFIG + camera_capture_params.yaml DEPENDS arch_io_pins ) diff --git a/src/drivers/camera_capture/camera_capture_params.c b/src/drivers/camera_capture/camera_capture_params.c deleted file mode 100644 index 606cf91f23..0000000000 --- a/src/drivers/camera_capture/camera_capture_params.c +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** - * - * Copyright (c) 2017 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file camera_capture_params.c - * Camera capture parameters - * - * @author Mohammed Kabir - */ -/** - * Camera strobe delay - * - * This parameter sets the delay between image integration start and strobe firing - * - * @unit ms - * @min 0.0 - * @max 100.0 - * @decimal 1 - * @group Camera Capture - */ -PARAM_DEFINE_FLOAT(CAM_CAP_DELAY, 0.0f); - -/** - * Camera capture feedback - * - * Enables camera capture feedback - * - * @boolean - * @group Camera Control - * @reboot_required true - */ -PARAM_DEFINE_INT32(CAM_CAP_FBACK, 0); - -/** - * Camera capture timestamping mode - * - * Change time measurement - * - * @value 0 Get absolute timestamp - * @value 1 Get timestamp of mid exposure (active high) - * @value 2 Get timestamp of mid exposure (active low) - * - * @group Camera Control - * @reboot_required true - */ -PARAM_DEFINE_INT32(CAM_CAP_MODE, 0); - -/** - * Camera capture edge - * - * @value 0 Falling edge - * @value 1 Rising edge - * - * @group Camera Control - * @reboot_required true - */ -PARAM_DEFINE_INT32(CAM_CAP_EDGE, 0); diff --git a/src/drivers/camera_capture/camera_capture_params.yaml b/src/drivers/camera_capture/camera_capture_params.yaml new file mode 100644 index 0000000000..0ab50066f3 --- /dev/null +++ b/src/drivers/camera_capture/camera_capture_params.yaml @@ -0,0 +1,44 @@ +module_name: camera_capture +parameters: +- group: Camera Capture + definitions: + CAM_CAP_DELAY: + description: + short: Camera strobe delay + long: This parameter sets the delay between image integration start and strobe + firing + type: float + default: 0.0 + unit: ms + min: 0.0 + max: 100.0 + decimal: 1 +- group: Camera Control + definitions: + CAM_CAP_FBACK: + description: + short: Camera capture feedback + long: Enables camera capture feedback + type: boolean + default: 0 + reboot_required: true + CAM_CAP_MODE: + description: + short: Camera capture timestamping mode + long: Change time measurement + type: enum + values: + 0: Get absolute timestamp + 1: Get timestamp of mid exposure (active high) + 2: Get timestamp of mid exposure (active low) + default: 0 + reboot_required: true + CAM_CAP_EDGE: + description: + short: Camera capture edge + type: enum + values: + 0: Falling edge + 1: Rising edge + default: 0 + reboot_required: true