Skip to content

Commit

Permalink
Cleaned up rove_nav_params.yaml and remapped nav's cmd_vel to nav_vel
Browse files Browse the repository at this point in the history
  • Loading branch information
IliTheButterfly committed Jun 21, 2024
1 parent abdac96 commit 9a01e15
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 0 additions & 3 deletions src/rove_navigation/config/rove_nav_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ global_costmap:
origin_z: 0.0
z_resolution: 0.05
z_voxels: 16
max_obstacle_height: 2.0
unknown_threshold: 15
mark_threshold: 0
observation_sources: pointcloud
Expand Down Expand Up @@ -268,7 +267,6 @@ local_costmap:
height: 3
resolution: 0.05
robot_radius: 0.22 # radius set and used, so no footprint points
resolution: 0.05
plugins: ["obstacle_layer", "voxel_layer", "inflation_layer"]
obstacle_layer:
plugin: "nav2_costmap_2d::ObstacleLayer"
Expand Down Expand Up @@ -310,7 +308,6 @@ local_costmap:
origin_z: 0.0
z_resolution: 0.05
z_voxels: 16
max_obstacle_height: 2.0
unknown_threshold: 15
mark_threshold: 0
observation_sources: pointcloud
Expand Down
16 changes: 10 additions & 6 deletions src/rove_navigation/launch/navigation.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

from ament_index_python.packages import get_package_share_directory
from launch import LaunchDescription
from launch.actions import IncludeLaunchDescription
from launch.actions import IncludeLaunchDescription, GroupAction
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch.substitutions import PathJoinSubstitution
from launch_ros.substitutions import FindPackageShare

from launch_ros.actions import SetRemap

def generate_launch_description():

pkg_rove_navigation = get_package_share_directory('rove_navigation')

navigation_launch_path = PathJoinSubstitution(
Expand All @@ -24,9 +23,14 @@ def generate_launch_description():
launch_arguments={
'use_sim_time': 'true',
'params_file': nav2_config_path
}.items()
}.items(),
)

return LaunchDescription([
nav
GroupAction(
actions=[
SetRemap(src='cmd_vel', dst='nav_vel'),
nav,
]
)
])

0 comments on commit 9a01e15

Please sign in to comment.