Skip to content

Commit 2f379d5

Browse files
authored
Merge pull request #2 from NVIDIA-ISAAC-ROS/release-2.1
Isaac ROS 2.1.0
2 parents 0c4a158 + 6e120ee commit 2f379d5

File tree

7 files changed

+177
-19
lines changed

7 files changed

+177
-19
lines changed
Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
{
2+
"configById": {
3+
"Image!hcyx98": {
4+
"cameraState": {
5+
"distance": 20,
6+
"perspective": true,
7+
"phi": 60,
8+
"target": [
9+
0,
10+
0,
11+
0
12+
],
13+
"targetOffset": [
14+
0,
15+
0,
16+
0
17+
],
18+
"targetOrientation": [
19+
0,
20+
0,
21+
0,
22+
1
23+
],
24+
"thetaOffset": 45,
25+
"fovy": 45,
26+
"near": 0.5,
27+
"far": 5000
28+
},
29+
"followMode": "follow-pose",
30+
"scene": {},
31+
"transforms": {},
32+
"topics": {
33+
"/plan": {
34+
"visible": false
35+
},
36+
"/trajectories": {
37+
"visible": false
38+
},
39+
"/back/scan": {
40+
"visible": false
41+
},
42+
"/front/scan": {
43+
"visible": false
44+
},
45+
"/scan": {
46+
"visible": false
47+
},
48+
"/global_costmap/costmap": {
49+
"visible": false
50+
},
51+
"/local_costmap/costmap": {
52+
"visible": false
53+
},
54+
"/map": {
55+
"visible": false
56+
},
57+
"/local_costmap/voxel_grid": {
58+
"visible": false
59+
},
60+
"/pointcloud": {
61+
"visible": false
62+
},
63+
"/global_costmap/published_footprint": {
64+
"visible": false
65+
},
66+
"/local_costmap/published_footprint": {
67+
"visible": false
68+
},
69+
"/amcl_pose": {
70+
"visible": false
71+
},
72+
"/goal_pose": {
73+
"visible": false
74+
},
75+
"/initialpose": {
76+
"visible": false
77+
},
78+
"/move_base_simple/goal": {
79+
"visible": false
80+
},
81+
"/plan_smoothed": {
82+
"visible": false
83+
},
84+
"/transformed_global_plan": {
85+
"visible": false
86+
},
87+
"/unsmoothed_plan": {
88+
"visible": false
89+
}
90+
},
91+
"layers": {},
92+
"publish": {
93+
"type": "point",
94+
"poseTopic": "/move_base_simple/goal",
95+
"pointTopic": "/clicked_point",
96+
"poseEstimateTopic": "/initialpose",
97+
"poseEstimateXDeviation": 0.5,
98+
"poseEstimateYDeviation": 0.5,
99+
"poseEstimateThetaDeviation": 0.26179939
100+
},
101+
"imageMode": {
102+
"imageTopic": "/owl_front/left/image_resized"
103+
}
104+
},
105+
"Teleop!2422nyg": {
106+
"topic": "/virtual_joy/cmd_vel",
107+
"publishRate": 1,
108+
"upButton": {
109+
"field": "linear-x",
110+
"value": 0.5
111+
},
112+
"downButton": {
113+
"field": "linear-x",
114+
"value": -0.5
115+
},
116+
"leftButton": {
117+
"field": "angular-z",
118+
"value": 0.5
119+
},
120+
"rightButton": {
121+
"field": "angular-z",
122+
"value": -0.5
123+
}
124+
}
125+
},
126+
"globalVariables": {},
127+
"userNodes": {},
128+
"playbackConfig": {
129+
"speed": 1
130+
},
131+
"layout": {
132+
"first": "Image!hcyx98",
133+
"second": "Teleop!2422nyg",
134+
"direction": "row",
135+
"splitPercentage": 79.62239583333334
136+
}
137+
}

carter_navigation/launch/include/front_hawk_ess_nvblox.launch.py

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@
1919

2020
from ament_index_python.packages import get_package_share_directory
2121
from launch import LaunchDescription
22-
from launch_ros.actions import LoadComposableNodes, Node
22+
from launch.actions import DeclareLaunchArgument, OpaqueFunction
23+
from launch_ros.actions import LoadComposableNodes
2324
from launch_ros.descriptions import ComposableNode
25+
from launch.substitutions import LaunchConfiguration
2426

2527

26-
def generate_launch_description():
28+
def launch_setup(context):
2729
# Check if ESS model is available
28-
models_dir_path = os.path.dirname(
29-
os.path.realpath(__file__))+'/../../models'
30-
engine_file_path = models_dir_path+'/ess.engine'
30+
engine_file_path = LaunchConfiguration('engine_file_path').perform(context)
31+
if not engine_file_path:
32+
models_dir_path = os.path.dirname(
33+
os.path.realpath(__file__))+'/../../models'
34+
engine_file_path = models_dir_path+'/ess.engine'
3135
if not os.path.isfile(engine_file_path):
3236
raise Exception(
3337
f'ESS engine file not found at : {engine_file_path}.'
@@ -170,4 +174,14 @@ def generate_launch_description():
170174
]
171175
)
172176

173-
return LaunchDescription([load_hawk_ess_nvblox])
177+
return [load_hawk_ess_nvblox]
178+
179+
def generate_launch_description():
180+
launch_args = [
181+
DeclareLaunchArgument(
182+
'engine_file_path',
183+
default_value='',
184+
description='The absolute path to the ESS engine plan.')
185+
]
186+
return LaunchDescription(
187+
launch_args + [OpaqueFunction(function=launch_setup)])

carter_navigation/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<exec_depend>nav2_dwb_controller</exec_depend>
3434
<exec_depend>nav2_lifecycle_manager</exec_depend>
3535
<exec_depend>nav2_map_server</exec_depend>
36-
<exec_depend>nav2_recoveries</exec_depend>
3736
<exec_depend>nav2_planner</exec_depend>
3837
<exec_depend>nav2_msgs</exec_depend>
3938
<exec_depend>nav2_navfn_planner</exec_depend>

carter_navigation/params/carter_nav2.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ slam_toolbox:
8383
amcl:
8484
ros__parameters:
8585
use_sim_time: True
86-
alpha1: 0.2
87-
alpha2: 0.2
88-
alpha3: 0.2
89-
alpha4: 0.2
90-
alpha5: 0.2
86+
alpha1: 0.1
87+
alpha2: 0.1
88+
alpha3: 0.1
89+
alpha4: 0.1
90+
alpha5: 0.1
9191
base_frame_id: "base_link"
9292
beam_skip_distance: 0.5
9393
beam_skip_error_threshold: 0.9
9494
beam_skip_threshold: 0.3
9595
do_beamskip: false
9696
global_frame_id: "map"
9797
lambda_short: 0.1
98-
laser_likelihood_max_dist: 2.0
98+
laser_likelihood_max_dist: 4.0
9999
laser_max_range: 100.0
100100
laser_min_range: -1.0
101-
laser_model_type: "likelihood_field"
101+
laser_model_type: "beam"
102102
max_beams: 360
103103
max_particles: 2000
104104
min_particles: 500
@@ -110,14 +110,14 @@ amcl:
110110
resample_interval: 1
111111
robot_model_type: "nav2_amcl::DifferentialMotionModel"
112112
save_pose_rate: 0.5
113-
sigma_hit: 0.2
113+
sigma_hit: 0.1
114114
tf_broadcast: true
115115
transform_tolerance: 1.0
116116
update_min_a: 0.2
117117
update_min_d: 0.25
118118
z_hit: 0.5
119119
z_max: 0.05
120-
z_rand: 0.5
120+
z_rand: 0.4
121121
z_short: 0.05
122122
scan_topic: scan
123123

@@ -594,4 +594,4 @@ velocity_smoother:
594594
odom_topic: "odom"
595595
odom_duration: 0.1
596596
deadband_velocity: [0.0, 0.0, 0.0]
597-
velocity_timeout: 1.0
597+
velocity_timeout: 1.0

carter_navigation/params/mux.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ twist_mux:
88
nav2:
99
topic: cmd_vel
1010
timeout: 0.5
11-
priority: 50
11+
priority: 50
12+
virtual_joy:
13+
topic: virtual_joy/cmd_vel
14+
timeout: 0.5
15+
priority: 60

nova_carter.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ repositories:
6262
isaac_ros_depth_segmentation:
6363
type: git
6464
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_depth_segmentation.git
65-
version: main
65+
version: main

segway_rmp/isaac_ros_segway_rmp/config/segway_rmp_node.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ components:
9090
parameters:
9191
transmitter: tx_ego_motion
9292
recess_period: 100Hz
93+
- type: nvidia::gxf::MemoryAvailableSchedulingTerm
94+
parameters:
95+
allocator: allocator
96+
min_blocks: 1
9397
---
9498
name: sink_odometry
9599
components:

0 commit comments

Comments
 (0)