From b4b42ede6e61e3f18543d4b4f4ebc8fe2de8b72d Mon Sep 17 00:00:00 2001 From: dcutting133 Date: Fri, 25 Mar 2022 18:15:34 -0400 Subject: [PATCH] def*lder --- .../launch/include/{gazebo => }/gazebo.launch.py | 0 .../lidar_processor.launch.py => pcpl.launch.py} | 10 +++++----- .../pointcloud_to_laserscan.launch.py | 0 .../launch/include/{rviz => }/rviz.launch.py | 0 .../state_publishers.launch.py | 0 .../{waypoint_publisher => }/waypoint.launch.py | 0 mammoth_gazebo/launch/mammoth.launch.py | 16 ++++++++-------- .../lidar_processor.launch.py => pcpl.launch.py} | 10 +++++----- .../pointcloud_to_laserscan.launch.py | 0 .../include/{roboteq => }/roboteq.launch.py | 0 .../launch/include/{rviz => }/rviz.launch.py | 0 .../state_publishers.launch.py | 0 .../{waypoint_publisher => }/waypoint.launch.py | 0 mammoth_snowplow/launch/mammoth.launch.py | 16 ++++++++-------- 14 files changed, 26 insertions(+), 26 deletions(-) rename mammoth_gazebo/launch/include/{gazebo => }/gazebo.launch.py (100%) rename mammoth_gazebo/launch/include/{lidar_processor/lidar_processor.launch.py => pcpl.launch.py} (93%) rename mammoth_gazebo/launch/include/{pointcloud_to_laserscan => }/pointcloud_to_laserscan.launch.py (100%) rename mammoth_gazebo/launch/include/{rviz => }/rviz.launch.py (100%) rename mammoth_gazebo/launch/include/{state_publishers => }/state_publishers.launch.py (100%) rename mammoth_gazebo/launch/include/{waypoint_publisher => }/waypoint.launch.py (100%) rename mammoth_snowplow/launch/include/{lidar_processor/lidar_processor.launch.py => pcpl.launch.py} (93%) rename mammoth_snowplow/launch/include/{pointcloud_to_laserscan => }/pointcloud_to_laserscan.launch.py (100%) rename mammoth_snowplow/launch/include/{roboteq => }/roboteq.launch.py (100%) rename mammoth_snowplow/launch/include/{rviz => }/rviz.launch.py (100%) rename mammoth_snowplow/launch/include/{state_publishers => }/state_publishers.launch.py (100%) rename mammoth_snowplow/launch/include/{waypoint_publisher => }/waypoint.launch.py (100%) diff --git a/mammoth_gazebo/launch/include/gazebo/gazebo.launch.py b/mammoth_gazebo/launch/include/gazebo.launch.py similarity index 100% rename from mammoth_gazebo/launch/include/gazebo/gazebo.launch.py rename to mammoth_gazebo/launch/include/gazebo.launch.py diff --git a/mammoth_gazebo/launch/include/lidar_processor/lidar_processor.launch.py b/mammoth_gazebo/launch/include/pcpl.launch.py similarity index 93% rename from mammoth_gazebo/launch/include/lidar_processor/lidar_processor.launch.py rename to mammoth_gazebo/launch/include/pcpl.launch.py index e9e5ea1..1cb9977 100644 --- a/mammoth_gazebo/launch/include/lidar_processor/lidar_processor.launch.py +++ b/mammoth_gazebo/launch/include/pcpl.launch.py @@ -32,10 +32,10 @@ def generate_launch_description(): # Launch arguments use_sim_time = LaunchConfiguration('use_sim_time', default='true') - lidar_processor = Node( - package='lidar_processor', - executable='lidar_processor', - name='lidar_processor', + pcpl = Node( + package='pcpl', + executable='pcpl', + name='pcpl', output='screen', remappings=[ ('/lidar/raw_points', '/mammoth/raw_points'), @@ -56,5 +56,5 @@ def generate_launch_description(): description='Use simulation clock if true'), # Nodes - lidar_processor, + pcpl, ]) diff --git a/mammoth_gazebo/launch/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py b/mammoth_gazebo/launch/include/pointcloud_to_laserscan.launch.py similarity index 100% rename from mammoth_gazebo/launch/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py rename to mammoth_gazebo/launch/include/pointcloud_to_laserscan.launch.py diff --git a/mammoth_gazebo/launch/include/rviz/rviz.launch.py b/mammoth_gazebo/launch/include/rviz.launch.py similarity index 100% rename from mammoth_gazebo/launch/include/rviz/rviz.launch.py rename to mammoth_gazebo/launch/include/rviz.launch.py diff --git a/mammoth_gazebo/launch/include/state_publishers/state_publishers.launch.py b/mammoth_gazebo/launch/include/state_publishers.launch.py similarity index 100% rename from mammoth_gazebo/launch/include/state_publishers/state_publishers.launch.py rename to mammoth_gazebo/launch/include/state_publishers.launch.py diff --git a/mammoth_gazebo/launch/include/waypoint_publisher/waypoint.launch.py b/mammoth_gazebo/launch/include/waypoint.launch.py similarity index 100% rename from mammoth_gazebo/launch/include/waypoint_publisher/waypoint.launch.py rename to mammoth_gazebo/launch/include/waypoint.launch.py diff --git a/mammoth_gazebo/launch/mammoth.launch.py b/mammoth_gazebo/launch/mammoth.launch.py index 45d4ab6..03fc8ae 100644 --- a/mammoth_gazebo/launch/mammoth.launch.py +++ b/mammoth_gazebo/launch/mammoth.launch.py @@ -51,7 +51,7 @@ def generate_launch_description(): state_publishers = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/state_publishers/state_publishers.launch.py' + '/include/state_publishers.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -59,7 +59,7 @@ def generate_launch_description(): ign_gazebo = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/gazebo/gazebo.launch.py' + '/include/gazebo.launch.py' ]), ) joy_with_teleop_twist = IncludeLaunchDescription( @@ -72,10 +72,10 @@ def generate_launch_description(): }.items(), ) - lidar_processor = IncludeLaunchDescription( + pcpl = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/lidar_processor/lidar_processor.launch.py' + '/include/pcpl.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -83,7 +83,7 @@ def generate_launch_description(): pointcloud_to_laserscan = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py' + '/include/pointcloud_to_laserscan.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -99,7 +99,7 @@ def generate_launch_description(): rviz = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/rviz/rviz.launch.py' + '/include/rviz.launch.py' ]), launch_arguments={ 'use_rviz': use_rviz, @@ -110,7 +110,7 @@ def generate_launch_description(): waypoint_publisher = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_gazebo, 'launch'), - '/include/waypoint_publisher/waypoint.launch.py' + '/include/waypoint.launch.py' ]), launch_arguments={ 'use_sim_time': use_sim_time, @@ -151,7 +151,7 @@ def generate_launch_description(): state_publishers, ign_gazebo, joy_with_teleop_twist, - lidar_processor, + pcpl, pointcloud_to_laserscan, navigation, diff --git a/mammoth_snowplow/launch/include/lidar_processor/lidar_processor.launch.py b/mammoth_snowplow/launch/include/pcpl.launch.py similarity index 93% rename from mammoth_snowplow/launch/include/lidar_processor/lidar_processor.launch.py rename to mammoth_snowplow/launch/include/pcpl.launch.py index 663a779..6d24d63 100644 --- a/mammoth_snowplow/launch/include/lidar_processor/lidar_processor.launch.py +++ b/mammoth_snowplow/launch/include/pcpl.launch.py @@ -37,10 +37,10 @@ def generate_launch_description(): # Launch arguments use_sim_time = LaunchConfiguration('use_sim_time', default='false') - lidar_processor = Node( - package='lidar_processor', - executable='lidar_processor', - name='lidar_processor', + pcpl = Node( + package='pcpl', + executable='pcpl', + name='pcpl', output='screen', remappings=[ ('/lidar/raw_points', '/mammoth/raw_points'), @@ -61,5 +61,5 @@ def generate_launch_description(): description='Use simulation clock if true'), # Nodes - lidar_processor, + pcpl, ]) diff --git a/mammoth_snowplow/launch/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py b/mammoth_snowplow/launch/include/pointcloud_to_laserscan.launch.py similarity index 100% rename from mammoth_snowplow/launch/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py rename to mammoth_snowplow/launch/include/pointcloud_to_laserscan.launch.py diff --git a/mammoth_snowplow/launch/include/roboteq/roboteq.launch.py b/mammoth_snowplow/launch/include/roboteq.launch.py similarity index 100% rename from mammoth_snowplow/launch/include/roboteq/roboteq.launch.py rename to mammoth_snowplow/launch/include/roboteq.launch.py diff --git a/mammoth_snowplow/launch/include/rviz/rviz.launch.py b/mammoth_snowplow/launch/include/rviz.launch.py similarity index 100% rename from mammoth_snowplow/launch/include/rviz/rviz.launch.py rename to mammoth_snowplow/launch/include/rviz.launch.py diff --git a/mammoth_snowplow/launch/include/state_publishers/state_publishers.launch.py b/mammoth_snowplow/launch/include/state_publishers.launch.py similarity index 100% rename from mammoth_snowplow/launch/include/state_publishers/state_publishers.launch.py rename to mammoth_snowplow/launch/include/state_publishers.launch.py diff --git a/mammoth_snowplow/launch/include/waypoint_publisher/waypoint.launch.py b/mammoth_snowplow/launch/include/waypoint.launch.py similarity index 100% rename from mammoth_snowplow/launch/include/waypoint_publisher/waypoint.launch.py rename to mammoth_snowplow/launch/include/waypoint.launch.py diff --git a/mammoth_snowplow/launch/mammoth.launch.py b/mammoth_snowplow/launch/mammoth.launch.py index ae1ca5b..67066d4 100644 --- a/mammoth_snowplow/launch/mammoth.launch.py +++ b/mammoth_snowplow/launch/mammoth.launch.py @@ -52,7 +52,7 @@ def generate_launch_description(): state_publishers = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/state_publishers/state_publishers.launch.py' + '/include/state_publishers.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -70,7 +70,7 @@ def generate_launch_description(): roboteq = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/roboteq/roboteq.launch.py' + '/include/roboteq.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -83,10 +83,10 @@ def generate_launch_description(): launch_arguments={'use_sim_time': use_sim_time}.items(), ) - lidar_processor = IncludeLaunchDescription( + pcpl = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/lidar_processor/lidar_processor.launch.py' + '/include/pcpl.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -94,7 +94,7 @@ def generate_launch_description(): pointcloud_to_laserscan = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/pointcloud_to_laserscan/pointcloud_to_laserscan.launch.py' + '/include/pointcloud_to_laserscan.launch.py' ]), launch_arguments={'use_sim_time': use_sim_time}.items(), ) @@ -110,7 +110,7 @@ def generate_launch_description(): rviz = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/rviz/rviz.launch.py' + '/include/rviz.launch.py' ]), launch_arguments={ 'use_rviz': use_rviz, @@ -121,7 +121,7 @@ def generate_launch_description(): waypoint_publisher = IncludeLaunchDescription( PythonLaunchDescriptionSource([ os.path.join(pkg_mammoth_snowplow, 'launch'), - '/include/waypoint_publisher/waypoint.launch.py' + '/include/waypoint.launch.py' ]), launch_arguments={ 'use_sim_time': use_sim_time, @@ -163,7 +163,7 @@ def generate_launch_description(): roboteq, realsense, - lidar_processor, + pcpl, pointcloud_to_laserscan, navigation, rviz,