This commit is contained in:
bjoernellens1 2023-11-20 10:04:21 +01:00 committed by GitHub
parent cf665b848f
commit 5d9c2de9ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 34 additions and 34 deletions

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -28,7 +28,7 @@ from nav2_common.launch import RewrittenYaml
def generate_launch_description(): def generate_launch_description():
# Get the launch directory # 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') namespace = LaunchConfiguration('namespace')
use_sim_time = LaunchConfiguration('use_sim_time') use_sim_time = LaunchConfiguration('use_sim_time')

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]
@ -100,7 +100,7 @@ def generate_launch_description():
parameters=[lidar_dir], 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( twist_mux = Node(
package="twist_mux", package="twist_mux",
executable="twist_mux", executable="twist_mux",

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -30,7 +30,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -41,7 +41,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]
@ -91,7 +91,7 @@ def generate_launch_description():
use_sim_time = False use_sim_time = False
slam_params_file = PathJoinSubstitution( slam_params_file = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"mapper_params_online_async.yaml" "mapper_params_online_async.yaml"
] ]

View File

@ -30,7 +30,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -41,7 +41,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]
@ -91,7 +91,7 @@ def generate_launch_description():
use_sim_time = False use_sim_time = False
slam_params_file = PathJoinSubstitution( slam_params_file = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"mapper_params_online_async.yaml" "mapper_params_online_async.yaml"
] ]

View File

@ -28,7 +28,7 @@ from nav2_common.launch import RewrittenYaml
def generate_launch_description(): def generate_launch_description():
# Get the launch directory # 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') namespace = LaunchConfiguration('namespace')
use_sim_time = LaunchConfiguration('use_sim_time') use_sim_time = LaunchConfiguration('use_sim_time')

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]
@ -99,7 +99,7 @@ def generate_launch_description():
parameters=[lidar_dir], 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( twist_mux = Node(
package="twist_mux", package="twist_mux",
executable="twist_mux", executable="twist_mux",

View File

@ -29,7 +29,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -40,7 +40,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]

View File

@ -32,7 +32,7 @@ def generate_launch_description():
" ", " ",
PathJoinSubstitution( PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_description"), FindPackageShare("cps_loki_description"),
"urdf", "urdf",
"odrive_diffbot.urdf.xacro" "odrive_diffbot.urdf.xacro"
] ]
@ -43,7 +43,7 @@ def generate_launch_description():
robot_controllers = PathJoinSubstitution( robot_controllers = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"diffbot_controllers.yaml", "diffbot_controllers.yaml",
] ]
@ -88,7 +88,7 @@ def generate_launch_description():
joystick_launch = IncludeLaunchDescription( joystick_launch = IncludeLaunchDescription(
PythonLaunchDescriptionSource([os.path.join( 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() )]), launch_arguments={'use_sim_time': 'true'}.items()
) )
@ -108,7 +108,7 @@ def generate_launch_description():
parameters=[lidar_dir], 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( twist_mux = Node(
package="twist_mux", package="twist_mux",
executable="twist_mux", executable="twist_mux",
@ -116,7 +116,7 @@ def generate_launch_description():
remappings=[('/cmd_vel_out','/diffbot_base_controller/cmd_vel_unstamped')] 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 # Include the Gazebo launch file, provided by the gazebo_ros package
gazebo = IncludeLaunchDescription( gazebo = IncludeLaunchDescription(
PythonLaunchDescriptionSource([os.path.join( PythonLaunchDescriptionSource([os.path.join(

View File

@ -48,7 +48,7 @@ def generate_launch_description():
rviz_config_file = PathJoinSubstitution( rviz_config_file = PathJoinSubstitution(
[ [
FindPackageShare("bot_mini_bringup"), FindPackageShare("cps_loki_bringup"),
"config", "config",
"bot_mini.rviz" "bot_mini.rviz"
] ]
@ -87,7 +87,7 @@ def generate_launch_description():
arguments=["-d", rviz_config_file], 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') 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 # Include the Gazebo launch file, provided by the gazebo_ros package

View File

@ -2,7 +2,7 @@ from setuptools import setup
import os import os
from glob import glob from glob import glob
package_name = 'bot_mini_bringup' package_name = 'cps_loki_bringup'
setup( setup(
name=package_name, name=package_name,