Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Humble 2.10.4 #621

Merged
merged 4 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions depthai-ros/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package depthai-ros
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


2.10.4 (2024-11-07)
-------------------
* Fix rectified topic names
* Fix pointcloud launch
* Add sensor parameters for max autoexposure, sharpness, luma and chroma denoise

2.10.3 (2024-10-14)
-------------------
* Allow setting USB speed without specifying device information
Expand Down
2 changes: 1 addition & 1 deletion depthai-ros/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS

project(depthai-ros VERSION 2.10.3 LANGUAGES CXX C)
project(depthai-ros VERSION 2.10.4 LANGUAGES CXX C)

set(CMAKE_CXX_STANDARD 14)

Expand Down
2 changes: 1 addition & 1 deletion depthai-ros/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>depthai-ros</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>The depthai-ros package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
Expand Down
2 changes: 1 addition & 1 deletion depthai_bridge/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

project(depthai_bridge VERSION 2.10.3 LANGUAGES CXX C)
project(depthai_bridge VERSION 2.10.4 LANGUAGES CXX C)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
2 changes: 1 addition & 1 deletion depthai_bridge/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>depthai_bridge</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>The depthai_bridge package</description>

<maintainer email="[email protected]">Adam Serafin</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion depthai_descriptions/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(depthai_descriptions VERSION 2.10.3)
project(depthai_descriptions VERSION 2.10.4)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
Expand Down
2 changes: 1 addition & 1 deletion depthai_descriptions/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>depthai_descriptions</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>The depthai_descriptions package</description>

<maintainer email="[email protected]">Adam Serafin</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion depthai_examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS
project(depthai_examples VERSION 2.10.3 LANGUAGES CXX C)
project(depthai_examples VERSION 2.10.4 LANGUAGES CXX C)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
Expand Down
2 changes: 1 addition & 1 deletion depthai_examples/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>depthai_examples</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>The depthai_examples package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
Expand Down
2 changes: 1 addition & 1 deletion depthai_filters/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(depthai_filters VERSION 2.10.3 LANGUAGES CXX C)
project(depthai_filters VERSION 2.10.4 LANGUAGES CXX C)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
Expand Down
2 changes: 1 addition & 1 deletion depthai_filters/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>depthai_filters</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>Depthai filters package</description>
<maintainer email="[email protected]">Adam Serafin</maintainer>
<license>MIT</license>
Expand Down
2 changes: 1 addition & 1 deletion depthai_ros_driver/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.22)
project(depthai_ros_driver VERSION 2.10.3)
project(depthai_ros_driver VERSION 2.10.4)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_BUILD_SHARED_LIBS ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand Down
3 changes: 2 additions & 1 deletion depthai_ros_driver/config/pcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
i_align_depth: true
i_board_socket_id: 2
i_subpixel: true
i_publish_right_rect: true
i_right_rect_publish_topic: true
i_right_rect_synced: false
4 changes: 2 additions & 2 deletions depthai_ros_driver/launch/camera.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ def launch_setup(context, *args, **kwargs):
},
}
parameter_overrides["depth"] = {
"i_publish_left_rect": True,
"i_publish_right_rect": True,
"i_left_rect_publish_topic": True,
"i_right_rect_publish_topic": True,
}

tf_params = {}
Expand Down
2 changes: 1 addition & 1 deletion depthai_ros_driver/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>depthai_ros_driver</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>Depthai ROS Monolithic node.</description>
<maintainer email="[email protected]">Adam Serafin</maintainer>

Expand Down
2 changes: 1 addition & 1 deletion depthai_ros_driver/src/dai_nodes/sensors/stereo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void Stereo::setupRectQueue(std::shared_ptr<dai::Device> device,
pubConfig.width = ph->getOtherNodeParam<int>(sensorName, "i_width");
pubConfig.height = ph->getOtherNodeParam<int>(sensorName, "i_height");
pubConfig.topicName = "~/" + sensorName;
pubConfig.topicSuffix = rsCompabilityMode() ? "/image_rect_raw" : "/image_raw";
pubConfig.topicSuffix = rsCompabilityMode() ? "/image_rect_raw" : "/image_rect";
pubConfig.maxQSize = ph->getOtherNodeParam<int>(sensorName, "i_max_q_size");
pubConfig.socket = sensorInfo.socket;
pubConfig.infoMgrSuffix = "rect";
Expand Down
64 changes: 64 additions & 0 deletions depthai_ros_driver/src/param_handlers/sensor_param_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@ void SensorParamHandler::declareParams(std::shared_ptr<dai::node::MonoCamera> mo
}
monoCam->setImageOrientation(
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "AUTO"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
int expLimit = declareAndLogParam<int>("r_auto_exposure_limit", 1000);
if(declareAndLogParam<bool>("r_set_auto_exposure_limit", false)) {
monoCam->initialControl.setAutoExposureLimit(expLimit);
}
int sharpness = declareAndLogParam<int>("r_sharpness", 1);
if(declareAndLogParam("r_set_sharpness", false)) {
monoCam->initialControl.setSharpness(sharpness);
}
int chromaDenoise = declareAndLogParam<int>("r_chroma_denoise", 1);
if(declareAndLogParam("r_set_chroma_denoise", false)) {
monoCam->initialControl.setChromaDenoise(chromaDenoise);
}
int lumaDenoise = declareAndLogParam<int>("r_luma_denoise", 1);
if(declareAndLogParam("r_set_luma_denoise", false)) {
monoCam->initialControl.setLumaDenoise(lumaDenoise);
}
}
void SensorParamHandler::declareParams(std::shared_ptr<dai::node::ColorCamera> colorCam, dai_nodes::sensor_helpers::ImageSensor sensor, bool publish) {
declareAndLogParam<bool>("i_publish_topic", publish);
Expand Down Expand Up @@ -178,6 +194,22 @@ void SensorParamHandler::declareParams(std::shared_ptr<dai::node::ColorCamera> c
}
colorCam->setImageOrientation(
utils::getValFromMap(declareAndLogParam<std::string>("i_sensor_img_orientation", "AUTO"), dai_nodes::sensor_helpers::cameraImageOrientationMap));
int expLimit = declareAndLogParam<int>("r_auto_exposure_limit", 1000);
if(declareAndLogParam<bool>("r_set_auto_exposure_limit", false)) {
colorCam->initialControl.setAutoExposureLimit(expLimit);
}
int sharpness = declareAndLogParam<int>("r_sharpness", 1);
if(declareAndLogParam("r_set_sharpness", false)) {
colorCam->initialControl.setSharpness(sharpness);
}
int chromaDenoise = declareAndLogParam<int>("r_chroma_denoise", 1);
if(declareAndLogParam("r_set_chroma_denoise", false)) {
colorCam->initialControl.setChromaDenoise(chromaDenoise);
}
int lumaDenoise = declareAndLogParam<int>("r_luma_denoise", 1);
if(declareAndLogParam("r_set_luma_denoise", false)) {
colorCam->initialControl.setLumaDenoise(lumaDenoise);
}
}
dai::CameraControl SensorParamHandler::setRuntimeParams(const std::vector<rclcpp::Parameter>& params) {
dai::CameraControl ctrl;
Expand Down Expand Up @@ -216,6 +248,38 @@ dai::CameraControl SensorParamHandler::setRuntimeParams(const std::vector<rclcpp
if(getParam<bool>("r_set_man_whitebalance")) {
ctrl.setManualWhiteBalance(p.get_value<int>());
}
} else if(p.get_name() == getFullParamName("r_set_auto_exposure_limit")) {
if(p.get_value<bool>()) {
ctrl.setAutoExposureLimit(getParam<int>("r_auto_exposure_limit"));
}
} else if(p.get_name() == getFullParamName("r_auto_exposure_limit")) {
if(getParam<bool>("r_set_auto_exposure_limit")) {
ctrl.setAutoExposureLimit(p.get_value<int>());
}
} else if(p.get_name() == getFullParamName("r_set_sharpness")) {
if(p.get_value<bool>()) {
ctrl.setSharpness(getParam<int>("r_sharpness"));
}
} else if(p.get_name() == getFullParamName("r_sharpness")) {
if(getParam<bool>("r_set_sharpness")) {
ctrl.setSharpness(p.get_value<int>());
}
} else if(p.get_name() == getFullParamName("r_set_chroma_denoise")) {
if(p.get_value<bool>()) {
ctrl.setChromaDenoise(getParam<int>("r_chroma_denoise"));
}
} else if(p.get_name() == getFullParamName("r_chroma_denoise")) {
if(getParam<bool>("r_set_chroma_denoise")) {
ctrl.setChromaDenoise(p.get_value<int>());
}
} else if(p.get_name() == getFullParamName("r_set_luma_denoise")) {
if(p.get_value<bool>()) {
ctrl.setLumaDenoise(getParam<int>("r_luma_denoise"));
}
} else if(p.get_name() == getFullParamName("r_luma_denoise")) {
if(getParam<bool>("r_set_luma_denoise")) {
ctrl.setLumaDenoise(p.get_value<int>());
}
}
}
return ctrl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void StereoParamHandler::declareParams(std::shared_ptr<dai::node::StereoDepth> s
declareAndLogParam<bool>("i_left_rect_add_exposure_offset", false);
declareAndLogParam<int>("i_left_rect_exposure_offset", 0);
declareAndLogParam<bool>("i_left_rect_enable_feature_tracker", false);
declareAndLogParam<bool>("i_left_rect_synced", true);
declareAndLogParam<bool>("i_left_rect_synced", false);
declareAndLogParam<bool>("i_left_rect_publish_compressed", false);

declareAndLogParam<bool>("i_right_rect_publish_topic", false);
Expand All @@ -95,7 +95,7 @@ void StereoParamHandler::declareParams(std::shared_ptr<dai::node::StereoDepth> s
declareAndLogParam<bool>("i_right_rect_enable_feature_tracker", false);
declareAndLogParam<bool>("i_right_rect_add_exposure_offset", false);
declareAndLogParam<int>("i_right_rect_exposure_offset", 0);
declareAndLogParam<bool>("i_right_rect_synced", true);
declareAndLogParam<bool>("i_right_rect_synced", false);
declareAndLogParam<bool>("i_right_rect_publish_compressed", false);

declareAndLogParam<bool>("i_enable_spatial_nn", false);
Expand Down
2 changes: 1 addition & 1 deletion depthai_ros_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS

project(depthai_ros_msgs VERSION 2.10.3)
project(depthai_ros_msgs VERSION 2.10.4)

if(POLICY CMP0057)
cmake_policy(SET CMP0057 NEW)
Expand Down
2 changes: 1 addition & 1 deletion depthai_ros_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>depthai_ros_msgs</name>
<version>2.10.3</version>
<version>2.10.4</version>
<description>Package to keep interface independent of the driver</description>

<maintainer email="[email protected]">Adam Serafin</maintainer>
Expand Down
Loading