Skip to content

Commit c6792bd

Browse files
Isaac ROS 3.2
1 parent 7e44644 commit c6792bd

36 files changed

+778
-195
lines changed

docker/Dockerfile.nova_carter

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# license agreement from NVIDIA CORPORATION is strictly prohibited.
88
#####################################################################################
99

10-
ARG BASE_IMAGE
10+
ARG BASE_IMAGE="ubuntu:22.04"
1111
FROM ${BASE_IMAGE} as base_image
1212

1313
# Install prerequisites for nova_carter
@@ -22,9 +22,9 @@ RUN apt-get update && apt-get install -y \
2222
&& apt-get clean
2323

2424
# Install spatio_temporal_voxel_layer dependencies
25-
RUN apt-get update && apt-get install -y \
26-
ros-humble-twist-mux \
27-
ros-humble-joy-linux \
25+
RUN apt-get update && apt-get install -y \
26+
ros-humble-twist-mux \
27+
ros-humble-joy-linux \
2828
ros-humble-teleop-twist-joy \
2929
ros-humble-nav2* \
3030
ros-humble-nav2-bringup \
@@ -38,7 +38,7 @@ FROM base_image as use_cyclone_dds_arm64
3838
# Install and setup cyclone DDS
3939
RUN apt-get update && apt-get install -y ros-humble-rmw-cyclonedds-cpp
4040
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
41-
ENV CYCLONEDDS_URI='<CycloneDDS><Domain><General><Interfaces><NetworkInterface name="eth0" /></Interfaces></General></Domain></CycloneDDS>'
41+
ENV CYCLONEDDS_URI='<CycloneDDS><Domain><General><Interfaces><NetworkInterface name="eno1" /></Interfaces></General></Domain></CycloneDDS>'
4242

4343
## Else:
4444
FROM base_image as use_cyclone_dds_amd64

isaac_ros_segway_rmp/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,10 @@ if(BUILD_TESTING)
139139

140140
endif()
141141

142+
143+
# Embed versioning information into installed files
144+
ament_index_get_resource(ISAAC_ROS_COMMON_CMAKE_PATH isaac_ros_common_cmake_path isaac_ros_common)
145+
include("${ISAAC_ROS_COMMON_CMAKE_PATH}/isaac_ros_common-version-info.cmake")
146+
generate_version_info(${PROJECT_NAME})
147+
142148
ament_auto_package(INSTALL_TO_SHARE launch config)

isaac_ros_segway_rmp/launch/isaac_ros_segway_rmp.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def generate_launch_description():
2626
plugin='nvidia::isaac_ros::segway_rmp::SegwayRMPNode',
2727
name='segway_rmp',
2828
parameters=[{
29-
'enable_statistics': True,
29+
'enable_diagnostics': True,
3030
'topics_list': ['odom'],
3131
'expected_fps_list': [40.0],
3232
'jitter_tolerance_us': 200000

isaac_ros_segway_rmp/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
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_segway_rmp</name>
24-
<version>3.1.0</version>
24+
<version>3.2.0</version>
2525
<description>Support for SegwayRMP.</description>
2626

2727
<maintainer email="[email protected]">Isaac ROS Maintainers</maintainer>
@@ -51,6 +51,7 @@
5151
<depend>tf2_ros</depend>
5252

5353
<build_depend>gxf_isaac_gems</build_depend>
54+
<build_depend>isaac_ros_common</build_depend>
5455

5556
<test_depend>ament_lint_auto</test_depend>
5657
<test_depend>ament_lint_common</test_depend>

nova_carter.repos

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
repositories:
2+
isaac_manipulator:
3+
type: git
4+
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_manipulator.git
5+
version: main
26
isaac_perceptor:
37
type: git
48
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_perceptor.git
@@ -35,6 +39,10 @@ repositories:
3539
type: git
3640
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_image_segmentation.git
3741
version: main
42+
isaac_ros_compression:
43+
type: git
44+
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_compression.git
45+
version: main
3846
isaac_ros_map_localization:
3947
type: git
4048
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_map_localization.git
@@ -59,10 +67,14 @@ repositories:
5967
type: git
6068
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_visual_slam.git
6169
version: main
70+
isaac_ros_mapping_and_localization:
71+
type: git
72+
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_mapping_and_localization.git
73+
version: main
6274
magic_enum:
6375
type: git
6476
url: https://github.com/Neargye/magic_enum.git
65-
version: master
77+
version: v0.9.6
6678
opennav_docking:
6779
type: git
6880
url: https://github.com/open-navigation/opennav_docking.git
@@ -75,3 +87,7 @@ repositories:
7587
type: git
7688
url: https://github.com/SteveMacenski/spatio_temporal_voxel_layer
7789
version: ros2
90+
foxglove/schemas:
91+
type: git
92+
url: https://github.com/foxglove/schemas
93+
version: main

nova_carter_bringup/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,10 @@ if(BUILD_TESTING)
3131
add_subdirectory(test)
3232
endif()
3333

34+
35+
# Embed versioning information into installed files
36+
ament_index_get_resource(ISAAC_ROS_COMMON_CMAKE_PATH isaac_ros_common_cmake_path isaac_ros_common)
37+
include("${ISAAC_ROS_COMMON_CMAKE_PATH}/isaac_ros_common-version-info.cmake")
38+
generate_version_info(${PROJECT_NAME})
39+
3440
ament_auto_package(INSTALL_TO_SHARE launch)

nova_carter_bringup/foxglove_layouts/nova_carter_navigation.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"followTf": "map",
3131
"scene": {
3232
"labelScaleFactor": 0.99,
33-
"backgroundColor": "#3c3c3c"
33+
"backgroundColor": "#3c3c3c",
34+
"meshUpAxis": "z_up"
3435
},
3536
"transforms": {
3637
"frame:back_2d_lidar": {

0 commit comments

Comments
 (0)