Skip to content

Commit 2ce23a1

Browse files
jaiveersinghNVjaiveersinghNV
authored
Merge pull request #4 from NVIDIA-ISAAC-ROS/release-3.2
Isaac ROS 3.2
2 parents f94e333 + 9963f54 commit 2ce23a1

15 files changed

Lines changed: 158 additions & 181 deletions

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
**/resources/**/*.yaml filter=lfs diff=lfs merge=lfs -text
2626
**/resources/**/*.bag filter=lfs diff=lfs merge=lfs -text
2727

28-
# FIXME: Only for DNN packages
2928
# DNN Model files
3029
*.onnx filter=lfs diff=lfs merge=lfs -text
3130

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Ignore all pycache files
22
**/__pycache__/**
33

4-
# FIXME: Only for DNN-based packages
54
# Ignore TensorRT plan files
65
*.plan
76
*.engine

‎docker/Dockerfile.nova_developer_kit‎

Lines changed: 1 addition & 1 deletion
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}
1212

1313
# Install and setup cyclone DDS

‎nova_developer_kit.repos‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ repositories:
2727
type: git
2828
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_image_pipeline.git
2929
version: main
30+
isaac_ros_compression:
31+
type: git
32+
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_compression.git
33+
version: main
3034
isaac_ros_image_segmentation:
3135
type: git
3236
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_image_segmentation.git
@@ -47,7 +51,11 @@ repositories:
4751
type: git
4852
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_visual_slam.git
4953
version: main
54+
isaac_ros_mapping_and_localization:
55+
type: git
56+
url: https://github.com/NVIDIA-ISAAC-ROS/isaac_ros_mapping_and_localization.git
57+
version: main
5058
magic_enum:
5159
type: git
5260
url: https://github.com/Neargye/magic_enum.git
53-
version: master
61+
version: v0.9.6

‎nova_developer_kit_bringup/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ ament_auto_find_build_dependencies()
2727
if(BUILD_TESTING)
2828
find_package(ament_lint_auto REQUIRED)
2929
ament_lint_auto_find_test_dependencies()
30+
31+
add_subdirectory(test)
3032
endif()
3133

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+
3240
ament_auto_package(INSTALL_TO_SHARE launch)

‎nova_developer_kit_bringup/foxglove_layouts/nova_developer_kit_perceptor.json‎

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"3D!pkwsig": {
44
"cameraState": {
55
"perspective": true,
6-
"distance": 5.547791462416275,
7-
"phi": 66.31869920457885,
8-
"thetaOffset": 91.56089609591699,
6+
"distance": 5.839780486753937,
7+
"phi": 66.31869920457889,
8+
"thetaOffset": 91.56089609591737,
99
"targetOffset": [
10-
1.4519825693569217,
11-
-0.19168891677241376,
12-
-7.209386411596498e-16
10+
1.3759892372413398,
11+
-0.05553825129053335,
12+
-7.215336567244841e-16
1313
],
1414
"target": [
1515
0,
@@ -293,11 +293,14 @@
293293
"/unet/colored_segmentation_mask": {
294294
"visible": true
295295
},
296-
"/nvblox_human_node/color_layer": {
296+
"/nvblox_node/color_layer": {
297297
"visible": true
298298
},
299-
"/nvblox_human_node/human_voxels": {
299+
"/nvblox_node/human_voxels": {
300300
"visible": true
301+
},
302+
"/initialpose": {
303+
"visible": false
301304
}
302305
},
303306
"layers": {},
@@ -311,65 +314,12 @@
311314
"poseEstimateThetaDeviation": 0.26179939
312315
},
313316
"imageMode": {}
314-
},
315-
"Image!q55ga8": {
316-
"cameraState": {
317-
"distance": 20,
318-
"perspective": true,
319-
"phi": 60,
320-
"target": [
321-
0,
322-
0,
323-
0
324-
],
325-
"targetOffset": [
326-
0,
327-
0,
328-
0
329-
],
330-
"targetOrientation": [
331-
0,
332-
0,
333-
0,
334-
1
335-
],
336-
"thetaOffset": 45,
337-
"fovy": 45,
338-
"near": 0.5,
339-
"far": 5000
340-
},
341-
"followMode": "follow-pose",
342-
"scene": {
343-
"transforms": {
344-
"showLabel": true
345-
}
346-
},
347-
"transforms": {},
348-
"topics": {},
349-
"layers": {},
350-
"publish": {
351-
"type": "point",
352-
"poseTopic": "/move_base_simple/goal",
353-
"pointTopic": "/clicked_point",
354-
"poseEstimateTopic": "/initialpose",
355-
"poseEstimateXDeviation": 0.5,
356-
"poseEstimateYDeviation": 0.5,
357-
"poseEstimateThetaDeviation": 0.26179939
358-
},
359-
"imageMode": {
360-
"imageTopic": "/front_stereo_camera/left/image_resized_grayscale"
361-
}
362317
}
363318
},
364319
"globalVariables": {},
365320
"userNodes": {},
366321
"playbackConfig": {
367322
"speed": 1
368323
},
369-
"layout": {
370-
"first": "3D!pkwsig",
371-
"second": "Image!q55ga8",
372-
"direction": "column",
373-
"splitPercentage": 65.66940912490651
374-
}
324+
"layout": "3D!pkwsig"
375325
}

‎nova_developer_kit_bringup/foxglove_layouts/nova_developer_kit_perceptor_with_people.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,23 +248,23 @@
248248
"colorMap": "rainbow",
249249
"pointSize": 7
250250
},
251-
"/nvblox_human_node/mesh": {
251+
"/nvblox_node/mesh": {
252252
"visible": true
253253
},
254-
"/nvblox_human_node/static_esdf_pointcloud": {
254+
"/nvblox_node/static_esdf_pointcloud": {
255255
"visible": true,
256256
"colorField": "intensity",
257257
"colorMode": "colormap",
258258
"colorMap": "rainbow",
259259
"pointSize": 8
260260
},
261-
"/nvblox_human_node/human_voxels": {
261+
"/nvblox_node/human_voxels": {
262262
"visible": false
263263
},
264-
"/nvblox_human_node/dynamic_occupancy_layer": {
264+
"/nvblox_node/dynamic_occupancy_layer": {
265265
"visible": true
266266
},
267-
"/nvblox_human_node/combined_esdf_pointcloud": {
267+
"/nvblox_node/combined_esdf_pointcloud": {
268268
"visible": false,
269269
"colorField": "intensity",
270270
"colorMode": "colormap",

‎nova_developer_kit_bringup/launch/include/perceptor_include.launch.py‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,35 @@
1818
# flake8: noqa: F403,F405
1919
import isaac_ros_launch_utils as lu
2020
from isaac_ros_launch_utils.all_types import *
21-
22-
# Camera config string is a subset of:
23-
# - driver,rectify,resize,ess_full,ess_light,ess_skip_frames,cuvslam,nvblox
24-
perceptor_configurations = {
25-
'front_configuration': {
26-
'front_stereo_camera': 'driver,rectify,resize,ess_full,cuvslam,nvblox',
27-
'back_stereo_camera': '',
28-
'left_stereo_camera': '',
29-
'right_stereo_camera': '',
30-
},
31-
'front_people_configuration': {
32-
'front_stereo_camera': 'driver,rectify,resize,ess_full,cuvslam,nvblox_people',
33-
'back_stereo_camera': '',
34-
'left_stereo_camera': '',
35-
'right_stereo_camera': '',
36-
},
37-
'front_left_right_configuration': {
38-
'front_stereo_camera': 'driver,rectify,resize,ess_full,cuvslam,nvblox',
39-
'back_stereo_camera': '',
40-
'left_stereo_camera': 'driver,rectify,resize,ess_light,ess_skip_frames,cuvslam,nvblox',
41-
'right_stereo_camera': 'driver,rectify,resize,ess_light,ess_skip_frames,cuvslam,nvblox',
42-
},
43-
'front_left_right_people_configuration': {
44-
'front_stereo_camera': 'driver,rectify,resize,ess_full,cuvslam,nvblox_people',
45-
'back_stereo_camera': '',
46-
'left_stereo_camera': 'driver,rectify,resize,ess_light,ess_skip_frames,cuvslam,nvblox',
47-
'right_stereo_camera': 'driver,rectify,resize,ess_light,ess_skip_frames,cuvslam,nvblox',
48-
},
49-
}
21+
import isaac_ros_perceptor_python_utils.launch_utils as pu
5022

5123

5224
def generate_launch_description() -> LaunchDescription:
5325
args = lu.ArgumentContainer()
5426

5527
# String specifying the stereo camera configuration.
5628
args.add_arg('stereo_camera_configuration')
29+
args.add_arg('nvblox_global_frame', 'odom')
30+
args.add_arg('vslam_map_frame', 'map')
31+
args.add_arg('vslam_odom_frame', 'odom')
32+
args.add_arg('vslam_image_qos')
33+
args.add_arg('disable_cuvslam', False)
34+
args.add_arg('disable_nvblox', False)
35+
args.add_arg('disable_vgl', True)
36+
args.add_arg('nvblox_param_filename', 'params/nvblox_perceptor.yaml')
37+
args.add_arg('nvblox_after_shutdown_map_save_path', '')
38+
args.add_arg('is_sim', False)
39+
actions = args.get_launch_actions()
5740

58-
perceptor_configuration = lu.get_dict_value(str(perceptor_configurations),
59-
args.stereo_camera_configuration)
41+
perceptor_configuration, loggings = pu.load_perceptor_configuration(
42+
args.stereo_camera_configuration, args.disable_cuvslam, args.disable_nvblox, args.disable_vgl)
43+
actions.extend(loggings)
6044

6145
enabled_stereo_cameras_drivers = lu.get_keys_with_substring_in_value(
6246
perceptor_configuration, 'driver')
6347
enable_people_segmentation = lu.dict_values_contain_substring(perceptor_configuration,
6448
'nvblox_people')
6549

66-
actions = args.get_launch_actions()
6750
actions.append(
6851
lu.include(
6952
'nova_developer_kit_bringup',
@@ -78,7 +61,16 @@ def generate_launch_description() -> LaunchDescription:
7861
lu.include(
7962
'isaac_ros_perceptor_bringup',
8063
'launch/perceptor_general.launch.py',
81-
launch_arguments={'perceptor_configuration': perceptor_configuration},
64+
launch_arguments={
65+
'perceptor_configuration': perceptor_configuration,
66+
'nvblox_global_frame': args.nvblox_global_frame,
67+
'vslam_odom_frame': args.vslam_odom_frame,
68+
'vslam_map_frame': args.vslam_map_frame,
69+
'nvblox_param_filename': args.nvblox_param_filename,
70+
'nvblox_after_shutdown_map_save_path': args.nvblox_after_shutdown_map_save_path,
71+
'vslam_image_qos': args.vslam_image_qos,
72+
'is_sim': args.is_sim,
73+
},
8274
))
8375

8476
return LaunchDescription(actions)

‎nova_developer_kit_bringup/launch/include/sensors_include.launch.py‎

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

0 commit comments

Comments
 (0)