Skip to content

Commit 9c9999a

Browse files
committed
Minor bug
1 parent 4eb8103 commit 9c9999a

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

elevation_mapping_cupy/config/core/core_param.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,8 @@
7373

7474
#### Initializer ########
7575
initialize_method: 'linear' # Choose one from 'nearest', 'linear', 'cubic'
76-
<<<<<<< HEAD
77-
initialize_frame_id: ['base_link'] # One tf (like ['footprint'] ) initializes a square around it.
78-
initialize_tf_offset: [0.0] # Optional z-offset(s) for initializer (same length as initialize_frame_id).
79-
=======
8076
initialize_frame_id: ['zed_camera_link'] # One tf (like ['footprint'] ) initializes a square around it.
8177
initialize_tf_offset: [0.0, 0.0, 0.0, 0.0] # z direction. Should be same number as initialize_frame_id.
82-
>>>>>>> ptz
8378
dilation_size_initialize: 2 # dilation size after the init.
8479
initialize_tf_grid_size: 1.0 # This is not used if number of tf is more than 3.
8580
use_initializer_at_start: true # Use initializer when the node starts.

elevation_mapping_cupy/config/setups/menzi/base.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
publishers:
99
elevation_map_raw:
10-
layers: ['elevation', 'traversability', 'variance']
10+
layers: ['elevation']
1111
basic_layers: ['elevation']
1212
fps: 10.0
1313
elevation_map_filter:
14-
layers: ['inpaint', 'smooth', 'min_filter', 'upper_bound']
14+
layers: ['inpaint']
1515
basic_layers: ['inpaint']
1616
fps: 5.0

elevation_mapping_cupy/launch/elevation_mapping.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def generate_launch_description():
3232
# elevation_mapping_cupy/elevation_mapping_cupy/rviz/ros2.rviz
3333
rviz_config_arg = DeclareLaunchArgument(
3434
'rviz_config',
35-
default_value='',
35+
default_value='/home/tutuna/colcon_ws/src/elevation_mapping_cupy/elevation_mapping_cupy/rviz/ros2.rviz',
3636
description='Path to the RViz config file'
3737
)
3838

0 commit comments

Comments
 (0)