Skip to content

Commit 7263941

Browse files
Merge pull request #13 from NVIDIA-ISAAC-ROS/release-3.2
Isaac ROS 3.2
2 parents ffbf8b1 + 498d2ba commit 7263941

File tree

432 files changed

+22977
-19317
lines changed

Some content is hidden

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

432 files changed

+22977
-19317
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@
2121
*.etlt filter=lfs diff=lfs merge=lfs -text
2222
# For ROS bag files
2323
*.db3* filter=lfs diff=lfs merge=lfs -text
24+
# For meshes
25+
*.dae filter=lfs diff=lfs merge=lfs -text
26+
*.DAE filter=lfs diff=lfs merge=lfs -text
27+
*.stl filter=lfs diff=lfs merge=lfs -text
28+
*.STL filter=lfs diff=lfs merge=lfs -text

README.md

Lines changed: 43 additions & 43 deletions
Large diffs are not rendered by default.

benchmarks/isaac_ros_apriltag_benchmark/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ if(BUILD_TESTING)
4040
endif()
4141
endif()
4242

43+
44+
# Embed versioning information into installed files
45+
ament_index_get_resource(ISAAC_ROS_COMMON_CMAKE_PATH isaac_ros_common_cmake_path isaac_ros_common)
46+
include("${ISAAC_ROS_COMMON_CMAKE_PATH}/isaac_ros_common-version-info.cmake")
47+
generate_version_info(${PROJECT_NAME})
48+
4349
ament_auto_package(INSTALL_TO_SHARE scripts)

benchmarks/isaac_ros_apriltag_benchmark/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_apriltag_benchmark</name>
24-
<version>3.1.0</version>
24+
<version>3.2.0</version>
2525
<description>Scripts for benchmarking Isaac ROS Apriltag graphs</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
@@ -30,6 +30,7 @@ SPDX-License-Identifier: Apache-2.0
3030
<author>CY Chen</author>
3131

3232
<buildtool_depend>ament_cmake_auto</buildtool_depend>
33+
<build_depend>isaac_ros_common</build_depend>
3334

3435
<depend>rclpy</depend>
3536

benchmarks/isaac_ros_apriltag_benchmark/scripts/isaac_ros_apriltag_graph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ def launch_setup(container_prefix, container_sigterm_timeout):
111111
package='isaac_ros_benchmark',
112112
plugin='isaac_ros_benchmark::NitrosMonitorNode',
113113
parameters=[{
114-
'monitor_data_format': 'nitros_april_tag_detection_array',
115-
'use_nitros_type_monitor_sub': True,
114+
'monitor_data_format': 'isaac_ros_apriltag_interfaces/msg/AprilTagDetectionArray',
115+
'use_nitros_type_monitor_sub': False,
116116
}],
117117
remappings=[
118118
('output', 'apriltag_detections')],

benchmarks/isaac_ros_apriltag_benchmark/scripts/isaac_ros_apriltag_node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ def launch_setup(container_prefix, container_sigterm_timeout):
9898
package='isaac_ros_benchmark',
9999
plugin='isaac_ros_benchmark::NitrosMonitorNode',
100100
parameters=[{
101-
'monitor_data_format': 'nitros_april_tag_detection_array',
102-
'use_nitros_type_monitor_sub': True,
101+
'monitor_data_format': 'isaac_ros_apriltag_interfaces/msg/AprilTagDetectionArray',
102+
'use_nitros_type_monitor_sub': False,
103103
}],
104104
remappings=[('output', 'apriltag_detections')]
105105
)

benchmarks/isaac_ros_argus_camera_benchmark/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ if(BUILD_TESTING)
4040
endif()
4141
endif()
4242

43+
44+
# Embed versioning information into installed files
45+
ament_index_get_resource(ISAAC_ROS_COMMON_CMAKE_PATH isaac_ros_common_cmake_path isaac_ros_common)
46+
include("${ISAAC_ROS_COMMON_CMAKE_PATH}/isaac_ros_common-version-info.cmake")
47+
generate_version_info(${PROJECT_NAME})
48+
4349
ament_auto_package(INSTALL_TO_SHARE scripts)

benchmarks/isaac_ros_argus_camera_benchmark/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_argus_camera_benchmark</name>
24-
<version>3.1.0</version>
24+
<version>3.2.0</version>
2525
<description>Scripts for benchmarking Isaac ROS Argus camera graphs</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
@@ -30,6 +30,7 @@ SPDX-License-Identifier: Apache-2.0
3030
<author>CY Chen</author>
3131

3232
<buildtool_depend>ament_cmake_auto</buildtool_depend>
33+
<build_depend>isaac_ros_common</build_depend>
3334

3435
<depend>rclpy</depend>
3536

benchmarks/isaac_ros_bi3d_benchmark/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ if(BUILD_TESTING)
4040
endif()
4141
endif()
4242

43+
44+
# Embed versioning information into installed files
45+
ament_index_get_resource(ISAAC_ROS_COMMON_CMAKE_PATH isaac_ros_common_cmake_path isaac_ros_common)
46+
include("${ISAAC_ROS_COMMON_CMAKE_PATH}/isaac_ros_common-version-info.cmake")
47+
generate_version_info(${PROJECT_NAME})
48+
4349
ament_auto_package(INSTALL_TO_SHARE scripts)

benchmarks/isaac_ros_bi3d_benchmark/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SPDX-License-Identifier: Apache-2.0
2121
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
2222
<package format="3">
2323
<name>isaac_ros_bi3d_benchmark</name>
24-
<version>3.1.0</version>
24+
<version>3.2.0</version>
2525
<description>Scripts for benchmarking Isaac ROS Bi3D graphs</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
@@ -30,6 +30,7 @@ SPDX-License-Identifier: Apache-2.0
3030
<author>CY Chen</author>
3131

3232
<buildtool_depend>ament_cmake_auto</buildtool_depend>
33+
<build_depend>isaac_ros_common</build_depend>
3334

3435
<depend>rclpy</depend>
3536

0 commit comments

Comments
 (0)