Skip to content

Commit

Permalink
Updates for Isaac Sim 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ayushgnv committed Sep 20, 2024
1 parent 2a5b16d commit 2bfca8a
Show file tree
Hide file tree
Showing 39 changed files with 3,305 additions and 620 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [2.0.0] - 2024-09-20

### Added
- New `iw_hub_navigation` package to run Nav2 with new iw.hub robot in new environment [Foxy, Humble]
- New RViz config for TurtleBot tutorials [Noetic]
- New RViz config and launch file with Carter robot for SLAM with gmapping

### Changed
- Bumped versions in `isaacsim` package to Isaac Sim version 4.2.0 [Foxy, Humble]
- Changed `carter_2dnav` package to only use RTX Lidar [Noetic]
- Updated dockerfiles to use setuptools 70.0.0 [Humble, Foxy]
- Updated QoS settings for image subscribers in ``carter_stereo.rviz`` and ``carter_navigation.rviz`` config files. [Foxy, Humble]

## [1.1.0] - 2024-08-01

### Added
Expand Down
104 changes: 20 additions & 84 deletions foxy_ws/src/isaac_tutorials/rviz2/carter_stereo.rviz
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ Panels:
- /Global Options1
- /Status1
- /TF1
- /Odometry1/Topic1
- /Left Camera - RGB1
- /Left Camera - RGB1/Topic1
- /Right Camera - RGB1
- /Right Camera - RGB1/Topic1
- /PointCloud21
- /PointCloud21/Topic1
Splitter Ratio: 0.5
Tree Height: 469
Tree Height: 415
- Class: rviz_common/Selection
Name: Selection
- Class: rviz_common/Tool Properties
Expand Down Expand Up @@ -49,82 +54,13 @@ Visualization Manager:
Frame Timeout: 15
Frames:
All Enabled: true
base_link:
Value: true
chassis_link:
Value: true
front_2d_lidar:
Value: true
front_3d_lidar:
Value: true
front_stereo_camera_imu:
Value: true
front_stereo_camera_left_optical:
Value: true
front_stereo_camera_right_optical:
Value: true
left_stereo_camera_imu:
Value: true
left_stereo_camera_left_optical:
Value: true
left_stereo_camera_right_optical:
Value: true
odom:
Value: true
rear_2d_lidar:
Value: true
rear_stereo_camera:imu:
Value: true
rear_stereo_camera:left_rgb:
Value: true
rear_stereo_camera:right_rgb:
Value: true
right_stereo_camera_imu:
Value: true
right_stereo_camera_left_optical:
Value: true
right_stereo_camera_right_optical:
Value: true
Marker Scale: 1
Name: TF
Show Arrows: true
Show Axes: true
Show Names: false
Tree:
odom:
base_link:
chassis_link:
{}
front_2d_lidar:
{}
front_3d_lidar:
{}
front_stereo_camera_imu:
{}
front_stereo_camera_left_optical:
{}
front_stereo_camera_right_optical:
{}
left_stereo_camera_imu:
{}
left_stereo_camera_left_optical:
{}
left_stereo_camera_right_optical:
{}
rear_2d_lidar:
{}
rear_stereo_camera:imu:
{}
rear_stereo_camera:left_rgb:
{}
rear_stereo_camera:right_rgb:
{}
right_stereo_camera_imu:
{}
right_stereo_camera_left_optical:
{}
right_stereo_camera_right_optical:
{}
{}
Update Interval: 0
Value: true
- Angle Tolerance: 0.10000000149011612
Expand Down Expand Up @@ -176,7 +112,7 @@ Visualization Manager:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Reliability Policy: Best Effort
Value: /front_stereo_camera/left/image_raw
Value: true
- Class: rviz_default_plugins/Image
Expand All @@ -190,7 +126,7 @@ Visualization Manager:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Reliability Policy: Best Effort
Value: /front_stereo_camera/right/image_raw
Value: true
- Alpha: 1
Expand Down Expand Up @@ -221,7 +157,7 @@ Visualization Manager:
Depth: 5
Durability Policy: Volatile
History Policy: Keep Last
Reliability Policy: Reliable
Reliability Policy: Best Effort
Value: /front_3d_lidar/lidar_points
Use Fixed Frame: true
Use rainbow: true
Expand Down Expand Up @@ -269,16 +205,16 @@ Visualization Manager:
Views:
Current:
Class: rviz_default_plugins/Orbit
Distance: 7.74399995803833
Distance: 17.497577667236328
Enable Stereo Rendering:
Stereo Eye Separation: 0.05999999865889549
Stereo Focal Distance: 1
Swap Stereo Eyes: false
Value: false
Focal Point:
X: 0.08670726418495178
Y: -0.48873579502105713
Z: 2.1064507961273193
X: -1.3069220781326294
Y: 2.1997342109680176
Z: -0.3324333727359772
Focal Shape Fixed Size: true
Focal Shape Size: 0.05000000074505806
Invert Z Axis: false
Expand All @@ -292,12 +228,12 @@ Visualization Manager:
Window Geometry:
Displays:
collapsed: false
Height: 752
Height: 704
Hide Left Dock: false
Hide Right Dock: true
Left Camera - RGB:
collapsed: false
QMainWindow State: 000000ff00000000fd0000000400000000000001880000029afc020000000dfb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003b0000029a000000c700fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000002800520069006700680074002000430061006d0065007200610020002d0020004400650070007400680200000285000002b4000002390000017ffb00000026004c006500660074002000430061006d0065007200610020002d0020004400650070007400680200000227000002b70000023c00000181fb00000022004c006500660074002000430061006d0065007200610020002d0020005200470042030000030e000001200000016b000000fafb0000002400520069006700680074002000430061006d0065007200610020002d002000520047004203000005360000011f00000169000000fbfb0000000a0049006d006100670065030000236c0000040e0000023e0000017e000000010000015f0000029afc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000029a000000a000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000004420000003efc0100000002fb0000000800540069006d00650100000000000004420000000000000000fb0000000800540069006d00650100000000000004500000000000000000000003dd0000029a00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
QMainWindow State: 000000ff00000000fd00000004000000000000022700000266fc020000000dfb0000001200530065006c0065006300740069006f006e00000001e10000009b0000005c00fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c006100790073010000003d00000266000000c900fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000002800520069006700680074002000430061006d0065007200610020002d0020004400650070007400680200000285000002b4000002390000017ffb00000026004c006500660074002000430061006d0065007200610020002d0020004400650070007400680200000227000002b70000023c00000181fb00000022004c006500660074002000430061006d0065007200610020002d00200052004700420300000270000000c80000016b000000fafb0000002400520069006700680074002000430061006d0065007200610020002d002000520047004203000002930000020500000169000000fbfb0000000a0049006d006100670065030000236c0000040e0000023e0000017e000000010000015f0000029afc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a00560069006500770073000000003b0000029a000000a400fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000004420000003efc0100000002fb0000000800540069006d00650100000000000004420000000000000000fb0000000800540069006d006501000000000000045000000000000000000000018b0000026600000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
Right Camera - RGB:
collapsed: false
Selection:
Expand All @@ -306,6 +242,6 @@ Window Geometry:
collapsed: false
Views:
collapsed: true
Width: 1387
X: 344
Y: 122
Width: 952
X: 72
Y: 27
2 changes: 1 addition & 1 deletion foxy_ws/src/isaacsim/launch/run_isaacsim.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# Declare all launch arguments corresponding to the bash script options
launch_args = [
DeclareLaunchArgument('version', default_value='4.1.0', description='Specify the version of Isaac Sim to use. Isaac Sim will be run from default install root folder for the specified version. Leave empty to use latest version of Isaac Sim.'),
DeclareLaunchArgument('version', default_value='4.2.0', description='Specify the version of Isaac Sim to use. Isaac Sim will be run from default install root folder for the specified version. Leave empty to use latest version of Isaac Sim.'),

DeclareLaunchArgument('install_path', default_value='', description='If Isaac Sim is insalled in a non-default location, provide a specific path to Isaac Sim installation root folder. (If defined, "version" parameter will be ignored)'),

Expand Down
2 changes: 1 addition & 1 deletion foxy_ws/src/isaacsim/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>isaacsim</name>
<version>0.1.0</version>
<version>0.2.0</version>
<description>
The isaacsim package that contains the script which can used to launch Isaac Sim as a ROS2 node from a launch file.
</description>
Expand Down
4 changes: 2 additions & 2 deletions foxy_ws/src/isaacsim/scripts/run_isaacsim.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# Default values
defaults = {
"isaac_sim_version": "4.1.0",
"isaac_sim_version": "4.2.0",
"isaac_sim_path": "",
"use_internal_libs": False,
"dds_type": "fastdds",
Expand Down Expand Up @@ -106,7 +106,7 @@ def execute_launch(self):
# If custom Isaac Sim Installation folder not given, use the default path using version number provided.
home_var = "USERPROFILE" if sys.platform == "win32" else "HOME"
home_path = os.getenv(home_var)
if version_ge(args.version, "4.1.0") and not version_gt(args.version, "2021.2.0"):
if version_ge(args.version, "4.2.0") and not version_gt(args.version, "2021.2.0"):
if sys.platform == "win32":
filepath_root = os.path.join(home_path, "AppData", "Local", "ov", "pkg", f"isaac-sim-{args.version}")
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def execute_second_node_if_condition_met(event, second_node_action):
return LaunchDescription(
[
# Declaring the Isaac Sim scene path. 'gui' launch argument is already used withing run_isaac_sim.launch.py
DeclareLaunchArgument("gui", default_value='omniverse://localhost/NVIDIA/Assets/Isaac/4.1/Isaac/Samples/ROS2/Scenario/carter_warehouse_navigation.usd', description="Path to isaac sim scene"),
DeclareLaunchArgument("gui", default_value='omniverse://localhost/NVIDIA/Assets/Isaac/4.2/Isaac/Samples/ROS2/Scenario/carter_warehouse_navigation.usd', description="Path to isaac sim scene"),

# Include Isaac Sim launch file from isaacsim package with given launch parameters.
IncludeLaunchDescription(
Expand All @@ -73,7 +73,7 @@ def execute_second_node_if_condition_met(event, second_node_action):
]
),
launch_arguments={
'version': '4.1.0',
'version': '4.2.0',
'play_sim_on_start': 'true',
}.items(),
),
Expand Down
2 changes: 1 addition & 1 deletion foxy_ws/src/navigation/carter_navigation/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>carter_navigation</name>
<version>0.1.0</version>
<version>0.1.1</version>
<description>
The carter_navigation package
</description>
Expand Down
13 changes: 13 additions & 0 deletions foxy_ws/src/navigation/iw_hub_navigation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
cmake_minimum_required(VERSION 3.5)
project(iw_hub_navigation)

find_package(ament_cmake REQUIRED)

install(DIRECTORY
launch
params
maps
rviz2
DESTINATION share/${PROJECT_NAME})

ament_package()
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
## Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
## NVIDIA CORPORATION and its licensors retain all intellectual property
## and proprietary rights in and to this software, related documentation
## and any modifications thereto. Any use, reproduction, disclosure or
## distribution of this software and related documentation without an express
## license agreement from NVIDIA CORPORATION is strictly prohibited.

import os
from ament_index_python.packages import get_package_share_directory
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument
from launch.actions import IncludeLaunchDescription
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch.substitutions import LaunchConfiguration
from launch_ros.actions import Node


def generate_launch_description():

use_sim_time = LaunchConfiguration("use_sim_time", default="True")

map_dir = LaunchConfiguration(
"map",
default=os.path.join(
get_package_share_directory("iw_hub_navigation"), "maps", "iw_hub_warehouse_navigation.yaml"
),
)

param_dir = LaunchConfiguration(
"params_file",
default=os.path.join(
get_package_share_directory("iw_hub_navigation"), "params", "iw_hub_navigation_params.yaml"
),
)

nav2_bringup_launch_dir = os.path.join(get_package_share_directory("nav2_bringup"), "launch")

rviz_config_dir = os.path.join(get_package_share_directory("iw_hub_navigation"), "rviz2", "iw_hub_navigation.rviz")

return LaunchDescription(
[
DeclareLaunchArgument("map", default_value=map_dir, description="Full path to map file to load"),
DeclareLaunchArgument(
"params_file", default_value=param_dir, description="Full path to param file to load"
),
DeclareLaunchArgument(
"use_sim_time", default_value="true", description="Use simulation (Omniverse Isaac Sim) clock if true"
),
IncludeLaunchDescription(
PythonLaunchDescriptionSource(os.path.join(nav2_bringup_launch_dir, "rviz_launch.py")),
launch_arguments={"namespace": "", "use_namespace": "False", "rviz_config": rviz_config_dir}.items(),
),
IncludeLaunchDescription(
PythonLaunchDescriptionSource([nav2_bringup_launch_dir, "/bringup_launch.py"]),
launch_arguments={"map": map_dir, "use_sim_time": use_sim_time, "params_file": param_dir}.items(),
),
]
)
Loading

0 comments on commit 2bfca8a

Please sign in to comment.