From 5d9c2de9eedb6afbab5108f06ab0c1aa2668811d Mon Sep 17 00:00:00 2001 From: bjoernellens1 <64093272+bjoernellens1@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:04:21 +0100 Subject: [PATCH] update --- launch/full_bot_mini.launch.py | 4 ++-- launch/min_bot_mini.launch.py | 4 ++-- launch/nav2.launch.py | 2 +- launch/robot_cam.launch.py | 4 ++-- launch/robot_controller.launch.py | 4 ++-- launch/robot_joy_teleop.launch.py | 6 +++--- launch/robot_lidar.launch.py | 4 ++-- launch/robot_localization.launch.py | 6 +++--- launch/robot_mapper.launch.py | 6 +++--- launch/robot_navigation.launch.py | 2 +- launch/robot_twist_mux.launch.py | 6 +++--- launch/rsp.launch.py | 4 ++-- launch/sim.launch.py | 10 +++++----- launch/sim_bot_mini.launch.py | 4 ++-- setup.py | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/launch/full_bot_mini.launch.py b/launch/full_bot_mini.launch.py index 942cb24..5f2abcb 100644 --- a/launch/full_bot_mini.launch.py +++ b/launch/full_bot_mini.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/min_bot_mini.launch.py b/launch/min_bot_mini.launch.py index e7c4d5d..4c892d8 100644 --- a/launch/min_bot_mini.launch.py +++ b/launch/min_bot_mini.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/nav2.launch.py b/launch/nav2.launch.py index f016df9..3c5ca58 100644 --- a/launch/nav2.launch.py +++ b/launch/nav2.launch.py @@ -28,7 +28,7 @@ from nav2_common.launch import RewrittenYaml def generate_launch_description(): # Get the launch directory - bringup_dir = get_package_share_directory('bot_mini_bringup') + bringup_dir = get_package_share_directory('cps_loki_bringup') namespace = LaunchConfiguration('namespace') use_sim_time = LaunchConfiguration('use_sim_time') diff --git a/launch/robot_cam.launch.py b/launch/robot_cam.launch.py index f3b7a60..30ae325 100644 --- a/launch/robot_cam.launch.py +++ b/launch/robot_cam.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/robot_controller.launch.py b/launch/robot_controller.launch.py index 3dbdbb3..e1a337f 100644 --- a/launch/robot_controller.launch.py +++ b/launch/robot_controller.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/robot_joy_teleop.launch.py b/launch/robot_joy_teleop.launch.py index 8806c54..5d2e475 100644 --- a/launch/robot_joy_teleop.launch.py +++ b/launch/robot_joy_teleop.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] @@ -100,7 +100,7 @@ def generate_launch_description(): parameters=[lidar_dir], ) - twist_mux_params = os.path.join(get_package_share_directory('bot_mini_bringup'),'config','twist_mux.yaml') + twist_mux_params = os.path.join(get_package_share_directory('cps_loki_bringup'),'config','twist_mux.yaml') twist_mux = Node( package="twist_mux", executable="twist_mux", diff --git a/launch/robot_lidar.launch.py b/launch/robot_lidar.launch.py index d64648c..cf4af81 100644 --- a/launch/robot_lidar.launch.py +++ b/launch/robot_lidar.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/robot_localization.launch.py b/launch/robot_localization.launch.py index 36c61eb..e969f6a 100644 --- a/launch/robot_localization.launch.py +++ b/launch/robot_localization.launch.py @@ -30,7 +30,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -41,7 +41,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] @@ -91,7 +91,7 @@ def generate_launch_description(): use_sim_time = False slam_params_file = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "mapper_params_online_async.yaml" ] diff --git a/launch/robot_mapper.launch.py b/launch/robot_mapper.launch.py index 36c61eb..e969f6a 100644 --- a/launch/robot_mapper.launch.py +++ b/launch/robot_mapper.launch.py @@ -30,7 +30,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -41,7 +41,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] @@ -91,7 +91,7 @@ def generate_launch_description(): use_sim_time = False slam_params_file = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "mapper_params_online_async.yaml" ] diff --git a/launch/robot_navigation.launch.py b/launch/robot_navigation.launch.py index f016df9..3c5ca58 100644 --- a/launch/robot_navigation.launch.py +++ b/launch/robot_navigation.launch.py @@ -28,7 +28,7 @@ from nav2_common.launch import RewrittenYaml def generate_launch_description(): # Get the launch directory - bringup_dir = get_package_share_directory('bot_mini_bringup') + bringup_dir = get_package_share_directory('cps_loki_bringup') namespace = LaunchConfiguration('namespace') use_sim_time = LaunchConfiguration('use_sim_time') diff --git a/launch/robot_twist_mux.launch.py b/launch/robot_twist_mux.launch.py index 33c1b01..013e231 100644 --- a/launch/robot_twist_mux.launch.py +++ b/launch/robot_twist_mux.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] @@ -99,7 +99,7 @@ def generate_launch_description(): parameters=[lidar_dir], ) - twist_mux_params = os.path.join(get_package_share_directory('bot_mini_bringup'),'config','twist_mux.yaml') + twist_mux_params = os.path.join(get_package_share_directory('cps_loki_bringup'),'config','twist_mux.yaml') twist_mux = Node( package="twist_mux", executable="twist_mux", diff --git a/launch/rsp.launch.py b/launch/rsp.launch.py index 4dbe3a5..0463cd8 100644 --- a/launch/rsp.launch.py +++ b/launch/rsp.launch.py @@ -29,7 +29,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -40,7 +40,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] diff --git a/launch/sim.launch.py b/launch/sim.launch.py index a8dcfa6..5799833 100644 --- a/launch/sim.launch.py +++ b/launch/sim.launch.py @@ -32,7 +32,7 @@ def generate_launch_description(): " ", PathJoinSubstitution( [ - FindPackageShare("bot_mini_description"), + FindPackageShare("cps_loki_description"), "urdf", "odrive_diffbot.urdf.xacro" ] @@ -43,7 +43,7 @@ def generate_launch_description(): robot_controllers = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "diffbot_controllers.yaml", ] @@ -88,7 +88,7 @@ def generate_launch_description(): joystick_launch = IncludeLaunchDescription( PythonLaunchDescriptionSource([os.path.join( - get_package_share_directory('bot_mini_bringup'),'joy_teleop.launch.py' + get_package_share_directory('cps_loki_bringup'),'joy_teleop.launch.py' )]), launch_arguments={'use_sim_time': 'true'}.items() ) @@ -108,7 +108,7 @@ def generate_launch_description(): parameters=[lidar_dir], ) - twist_mux_params = os.path.join(get_package_share_directory('bot_mini_bringup'),'config','twist_mux.yaml') + twist_mux_params = os.path.join(get_package_share_directory('cps_loki_bringup'),'config','twist_mux.yaml') twist_mux = Node( package="twist_mux", executable="twist_mux", @@ -116,7 +116,7 @@ def generate_launch_description(): remappings=[('/cmd_vel_out','/diffbot_base_controller/cmd_vel_unstamped')] ) - gazebo_params_file = os.path.join(get_package_share_directory('bot_mini_bringup'),'config','gazebo_params.yaml') + gazebo_params_file = os.path.join(get_package_share_directory('cps_loki_bringup'),'config','gazebo_params.yaml') # Include the Gazebo launch file, provided by the gazebo_ros package gazebo = IncludeLaunchDescription( PythonLaunchDescriptionSource([os.path.join( diff --git a/launch/sim_bot_mini.launch.py b/launch/sim_bot_mini.launch.py index aa4c26c..dcdbd3d 100644 --- a/launch/sim_bot_mini.launch.py +++ b/launch/sim_bot_mini.launch.py @@ -48,7 +48,7 @@ def generate_launch_description(): rviz_config_file = PathJoinSubstitution( [ - FindPackageShare("bot_mini_bringup"), + FindPackageShare("cps_loki_bringup"), "config", "bot_mini.rviz" ] @@ -87,7 +87,7 @@ def generate_launch_description(): arguments=["-d", rviz_config_file], ) - package_name='bot_mini_bringup' + package_name='cps_loki_bringup' gazebo_params_file = os.path.join(get_package_share_directory(package_name),'config','gazebo_params.yaml') # Include the Gazebo launch file, provided by the gazebo_ros package diff --git a/setup.py b/setup.py index 0ce3dbe..f3c8ecc 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup import os from glob import glob -package_name = 'bot_mini_bringup' +package_name = 'cps_loki_bringup' setup( name=package_name,