From b39899f2f31c626e15ef49040542455be7cf345b Mon Sep 17 00:00:00 2001 From: Adam Serafin Date: Tue, 15 Oct 2024 09:59:02 +0200 Subject: [PATCH] Update setting usb speed - Jazzy (#611) --- depthai-ros/CHANGELOG.rst | 4 ++++ depthai-ros/CMakeLists.txt | 2 +- depthai-ros/package.xml | 2 +- depthai_bridge/CMakeLists.txt | 2 +- depthai_bridge/package.xml | 2 +- depthai_descriptions/CMakeLists.txt | 2 +- depthai_descriptions/package.xml | 2 +- depthai_examples/CMakeLists.txt | 2 +- depthai_examples/package.xml | 2 +- depthai_filters/CMakeLists.txt | 2 +- depthai_filters/package.xml | 2 +- depthai_ros_driver/CMakeLists.txt | 2 +- depthai_ros_driver/package.xml | 2 +- depthai_ros_driver/src/camera.cpp | 4 +++- .../src/param_handlers/camera_param_handler.cpp | 2 +- depthai_ros_msgs/CMakeLists.txt | 2 +- depthai_ros_msgs/package.xml | 2 +- 17 files changed, 22 insertions(+), 16 deletions(-) diff --git a/depthai-ros/CHANGELOG.rst b/depthai-ros/CHANGELOG.rst index 51020a01..8e3c0c97 100644 --- a/depthai-ros/CHANGELOG.rst +++ b/depthai-ros/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package depthai-ros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.10.3 (2024-10-14) +------------------- +* Allow setting USB speed without specifying device information + 2.10.2 (2024-09-26) ------------------- * Fix Stereo K matrix publishing diff --git a/depthai-ros/CMakeLists.txt b/depthai-ros/CMakeLists.txt index f2766769..3da4853a 100644 --- a/depthai-ros/CMakeLists.txt +++ b/depthai-ros/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS -project(depthai-ros VERSION 2.10.2 LANGUAGES CXX C) +project(depthai-ros VERSION 2.10.3 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 14) diff --git a/depthai-ros/package.xml b/depthai-ros/package.xml index 4cf4aac6..5b9d07ee 100644 --- a/depthai-ros/package.xml +++ b/depthai-ros/package.xml @@ -1,7 +1,7 @@ depthai-ros - 2.10.2 + 2.10.3 The depthai-ros package diff --git a/depthai_bridge/CMakeLists.txt b/depthai_bridge/CMakeLists.txt index 9c199c09..caa37fad 100644 --- a/depthai_bridge/CMakeLists.txt +++ b/depthai_bridge/CMakeLists.txt @@ -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.2 LANGUAGES CXX C) +project(depthai_bridge VERSION 2.10.3 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/depthai_bridge/package.xml b/depthai_bridge/package.xml index 8d974ff3..7e440bc7 100644 --- a/depthai_bridge/package.xml +++ b/depthai_bridge/package.xml @@ -1,7 +1,7 @@ depthai_bridge - 2.10.2 + 2.10.3 The depthai_bridge package Adam Serafin diff --git a/depthai_descriptions/CMakeLists.txt b/depthai_descriptions/CMakeLists.txt index f524c03f..2d751133 100644 --- a/depthai_descriptions/CMakeLists.txt +++ b/depthai_descriptions/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(depthai_descriptions VERSION 2.10.2) +project(depthai_descriptions VERSION 2.10.3) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/depthai_descriptions/package.xml b/depthai_descriptions/package.xml index 5a190525..27f85f05 100644 --- a/depthai_descriptions/package.xml +++ b/depthai_descriptions/package.xml @@ -1,7 +1,7 @@ depthai_descriptions - 2.10.2 + 2.10.3 The depthai_descriptions package Adam Serafin diff --git a/depthai_examples/CMakeLists.txt b/depthai_examples/CMakeLists.txt index 98269251..48d76b9a 100644 --- a/depthai_examples/CMakeLists.txt +++ b/depthai_examples/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2) # CMake version in Ubuntu 18.04 LTS -project(depthai_examples VERSION 2.10.2 LANGUAGES CXX C) +project(depthai_examples VERSION 2.10.3 LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/depthai_examples/package.xml b/depthai_examples/package.xml index 35723f24..879d4861 100644 --- a/depthai_examples/package.xml +++ b/depthai_examples/package.xml @@ -1,7 +1,7 @@ depthai_examples - 2.10.2 + 2.10.3 The depthai_examples package diff --git a/depthai_filters/CMakeLists.txt b/depthai_filters/CMakeLists.txt index 98c0d2f3..cdac3a5d 100644 --- a/depthai_filters/CMakeLists.txt +++ b/depthai_filters/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(depthai_filters VERSION 2.10.2 LANGUAGES CXX C) +project(depthai_filters VERSION 2.10.3 LANGUAGES CXX C) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/depthai_filters/package.xml b/depthai_filters/package.xml index 25698c16..1cc2c127 100644 --- a/depthai_filters/package.xml +++ b/depthai_filters/package.xml @@ -2,7 +2,7 @@ depthai_filters - 2.10.2 + 2.10.3 Depthai filters package Adam Serafin MIT diff --git a/depthai_ros_driver/CMakeLists.txt b/depthai_ros_driver/CMakeLists.txt index dcfc4c6b..d17b8a9c 100644 --- a/depthai_ros_driver/CMakeLists.txt +++ b/depthai_ros_driver/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.22) -project(depthai_ros_driver VERSION 2.10.2) +project(depthai_ros_driver VERSION 2.10.3) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_BUILD_SHARED_LIBS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/depthai_ros_driver/package.xml b/depthai_ros_driver/package.xml index dca5ce86..7d7f8ee6 100644 --- a/depthai_ros_driver/package.xml +++ b/depthai_ros_driver/package.xml @@ -2,7 +2,7 @@ depthai_ros_driver - 2.10.2 + 2.10.3 Depthai ROS Monolithic node. Adam Serafin diff --git a/depthai_ros_driver/src/camera.cpp b/depthai_ros_driver/src/camera.cpp index 69d77088..fe01bfee 100644 --- a/depthai_ros_driver/src/camera.cpp +++ b/depthai_ros_driver/src/camera.cpp @@ -198,7 +198,9 @@ void Camera::startDevice() { try { if(mxid.empty() && ip.empty() && usb_id.empty()) { RCLCPP_INFO(get_logger(), "No ip/mxid specified, connecting to the next available device."); - device = std::make_shared(); + auto info = dai::Device::getAnyAvailableDevice(); + auto speed = ph->getUSBSpeed(); + device = std::make_shared(std::get<1>(info), speed); camRunning = true; } else { std::vector availableDevices = dai::Device::getAllAvailableDevices(); diff --git a/depthai_ros_driver/src/param_handlers/camera_param_handler.cpp b/depthai_ros_driver/src/param_handlers/camera_param_handler.cpp index d043340e..ca3646a0 100644 --- a/depthai_ros_driver/src/param_handlers/camera_param_handler.cpp +++ b/depthai_ros_driver/src/param_handlers/camera_param_handler.cpp @@ -28,7 +28,7 @@ void CameraParamHandler::declareParams() { declareAndLogParam("i_enable_diagnostics", true); declareAndLogParam("i_enable_sync", true); declareAndLogParam("i_enable_ir", true); - declareAndLogParam("i_usb_speed", "SUPER_PLUS"); + declareAndLogParam("i_usb_speed", "SUPER"); declareAndLogParam("i_mx_id", ""); declareAndLogParam("i_ip", ""); declareAndLogParam("i_usb_port_id", ""); diff --git a/depthai_ros_msgs/CMakeLists.txt b/depthai_ros_msgs/CMakeLists.txt index 45aec171..b1b99c90 100644 --- a/depthai_ros_msgs/CMakeLists.txt +++ b/depthai_ros_msgs/CMakeLists.txt @@ -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.2) +project(depthai_ros_msgs VERSION 2.10.3) if(POLICY CMP0057) cmake_policy(SET CMP0057 NEW) diff --git a/depthai_ros_msgs/package.xml b/depthai_ros_msgs/package.xml index 615b9272..f7efee68 100644 --- a/depthai_ros_msgs/package.xml +++ b/depthai_ros_msgs/package.xml @@ -1,7 +1,7 @@ depthai_ros_msgs - 2.10.2 + 2.10.3 Package to keep interface independent of the driver Adam Serafin