Skip to content

Commit 81a10e1

Browse files
committed
Merge branch 'humble' into 'master'
Humble release for ifm3d version 1.2.6 See merge request syntron/support/csr/ifm3d/ifm3d-ros2!26
2 parents 5996843 + 1c5b723 commit 81a10e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3107
-975
lines changed

.gitignore

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# vscode
2+
.vscode/*
3+
!.vscode/settings.json
4+
!.vscode/tasks.json
5+
!.vscode/launch.json
6+
!.vscode/extensions.json
7+
!.vscode/*.code-snippets
8+
9+
# Local History for Visual Studio Code
10+
.history/
11+
12+
# Built Visual Studio Code Extensions
13+
*.vsix
14+
15+
16+
# ROS
17+
devel/
18+
logs/
19+
build/
20+
bin/
21+
lib/
22+
msg_gen/
23+
srv_gen/
24+
msg/*Action.msg
25+
msg/*ActionFeedback.msg
26+
msg/*ActionGoal.msg
27+
msg/*ActionResult.msg
28+
msg/*Feedback.msg
29+
msg/*Goal.msg
30+
msg/*Result.msg
31+
msg/_*.py
32+
build_isolated/
33+
devel_isolated/
34+
35+
# Generated by dynamic reconfigure
36+
*.cfgc
37+
/cfg/cpp/
38+
/cfg/*.py
39+
40+
# Ignore generated docs
41+
*.dox
42+
*.wikidoc
43+
44+
# eclipse stuff
45+
.project
46+
.cproject
47+
48+
# qcreator stuff
49+
CMakeLists.txt.user
50+
51+
srv/_*.py
52+
*.pcd
53+
*.pyc
54+
qtcreator-*
55+
*.user
56+
57+
/planning/cfg
58+
/planning/docs
59+
/planning/src
60+
61+
*~
62+
63+
# Emacs
64+
.#*
65+
66+
# Catkin custom files
67+
CATKIN_IGNORE

.vscode/launch.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 70 deletions
This file was deleted.

.vscode/tasks.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,67 @@
22
Changelog for package ifm3d-ros2
33
^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
1.1
6+
===
7+
8+
1.1.0
9+
------------------
10+
* Update for compatibility with O3R FW >= 1.0.14 and ifm3d >= 1.2.6
11+
* Using ifm3d::O3R instead of ifm3d::Device to access camera
12+
* Added `buffer_id_list` param to define which data to get from the device and consequently which topics to publish. Maps to ifm3d `buffer_id`.
13+
14+
* Remove the need to use cyclonedds: TODO: verification
15+
16+
* Remove dependency to Boost library
17+
18+
* Include Dockerfile and helper scripts:
19+
* Dockerfile for building the ROS2 node inside a Docker container
20+
* Helper build and launch scripts for ROS Docker images
21+
* Adds docker-compose example files for launching the ROS node on a O3R edge device: VPU
22+
23+
* Moved Publishers into node namespace: This matches the ifm3d-ros2 node version's naming (<= 1.0.x).
24+
25+
* Switch to a new camera.launch.py launch file (instead of camera_managed and camera_standalone): launches and activates a single camera node
26+
* focusses on configurability
27+
* camera_default_parameters.yaml contains only default params
28+
* Add option for visualization to launch file: If visualization is true, RViz2 with the config file from etc is opened
29+
* Formatting of node names improved
30+
* old launch files are marked as deprecated and will be removed with next release: please migrate your launch files to the new structure
31+
32+
* Switching json handling to ifm3d::json
33+
34+
* Reduce logging level for continuous outputs.
35+
36+
* Added topics:
37+
* diagnostics (published to global /diagnostic topic),
38+
* camera_info,
39+
* TOF_INFO,
40+
* RGB_INFO,
41+
* extrinsics
42+
43+
* Added parameters:
44+
* log_level,
45+
* tf related parameters (see parameters doc for more details),
46+
* buffer_id_list,
47+
* diag_mode
48+
49+
50+
551
1.0
652
===
7-
1.0.2 (unreleased)
53+
1.0.4 (unreleased)
54+
------------------
55+
* Updating to underlying ifm3d API version 1.1.1
56+
* Name change for TOF_INFO and RGB_INFO buffer.
57+
* Added Error, AsynError and AsyncNotification callbacks.
58+
59+
1.0.3 (unreleased)
60+
------------------
61+
* Updating to underlying ifm3d API version 1.0.1
62+
* Switching to using buffer_ids instead of schemas to determine data types.
63+
* Introducing buffer_id_utils.hpp for buffer_id handling.
64+
65+
1.0.2
866
------------------
967
* Fixed tf chain in launchfiles
1068

CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ endif()
1111

1212
set(IFM3D_ROS2_DEPS
1313
builtin_interfaces
14+
diagnostic_msgs
15+
geometry_msgs
1416
lifecycle_msgs
1517
rclcpp
1618
rclcpp_components
@@ -20,12 +22,12 @@ set(IFM3D_ROS2_DEPS
2022
rosidl_default_generators
2123
sensor_msgs
2224
std_msgs
25+
tf2_ros
2326
)
2427

25-
find_package(ifm3d 0.93.0 CONFIG REQUIRED COMPONENTS
26-
camera
28+
find_package(ifm3d 1.2.6 CONFIG REQUIRED COMPONENTS
29+
device
2730
framegrabber
28-
stlimage
2931
)
3032
find_package(ament_cmake_auto REQUIRED)
3133
find_package(ament_cmake_ros REQUIRED)
@@ -34,6 +36,10 @@ ament_auto_find_build_dependencies(REQUIRED ${IFM3D_ROS2_DEPS})
3436

3537
rosidl_generate_interfaces(${PROJECT_NAME}
3638
"msg/Extrinsics.msg"
39+
"msg/Intrinsics.msg"
40+
"msg/InverseIntrinsics.msg"
41+
"msg/RGBInfo.msg"
42+
"msg/TOFInfo.msg"
3743
"srv/Dump.srv"
3844
"srv/Config.srv"
3945
"srv/Softoff.srv"
@@ -52,9 +58,8 @@ include_directories(include)
5258
#
5359
add_library(ifm3d_ros2_camera_node SHARED src/lib/camera_node.cpp)
5460
target_link_libraries(ifm3d_ros2_camera_node
55-
ifm3d::camera
61+
ifm3d::device
5662
ifm3d::framegrabber
57-
ifm3d::stlimage
5863
)
5964
ament_target_dependencies(ifm3d_ros2_camera_node ${IFM3D_ROS2_DEPS})
6065
rclcpp_components_register_nodes(

0 commit comments

Comments
 (0)