ros2-fy: Separate the files in {config, launch} folders that were mad…

…e during ROS1 era
moveit · Jun 7, 2023 · 838613a · 838613a
1 parent 4441e44
commit 838613a
Show file tree

Hide file tree

Showing 51 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(panda_moveit_config)
 
 find_package(ament_cmake REQUIRED)
 
-install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
+install(DIRECTORY config ros1 DESTINATION share/${PROJECT_NAME})
 install(DIRECTORY launch DESTINATION share/${PROJECT_NAME}
   PATTERN "setup_assistant.launch" EXCLUDE)
 install(FILES .setup_assistant DESTINATION share/${PROJECT_NAME})

diff --git a/config/arm.xacro → ros1/config/arm.xacro b/config/arm.xacro → ros1/config/arm.xacro
diff --git a/config/cartesian_limits.yaml → ros1/config/cartesian_limits.yaml b/config/cartesian_limits.yaml → ros1/config/cartesian_limits.yaml
diff --git a/config/chomp_planning.yaml → ros1/config/chomp_planning.yaml b/config/chomp_planning.yaml → ros1/config/chomp_planning.yaml
diff --git a/config/fake_controllers.yaml → ros1/config/fake_controllers.yaml b/config/fake_controllers.yaml → ros1/config/fake_controllers.yaml
diff --git a/config/gazebo_controllers.yaml → ros1/config/gazebo_controllers.yaml b/config/gazebo_controllers.yaml → ros1/config/gazebo_controllers.yaml
diff --git a/config/hand.xacro → ros1/config/hand.xacro b/config/hand.xacro → ros1/config/hand.xacro
diff --git a/config/lerp_planning.yaml → ros1/config/lerp_planning.yaml b/config/lerp_planning.yaml → ros1/config/lerp_planning.yaml
diff --git a/config/ompl_planning.yaml → ros1/config/ompl_planning.yaml b/config/ompl_planning.yaml → ros1/config/ompl_planning.yaml
diff --git a/config/panda.srdf.xacro → ros1/config/panda.srdf.xacro b/config/panda.srdf.xacro → ros1/config/panda.srdf.xacro
diff --git a/config/ros_controllers.yaml → ros1/config/ros_controllers.yaml b/config/ros_controllers.yaml → ros1/config/ros_controllers.yaml
diff --git a/config/sensors_kinect_depthmap.yaml → ros1/config/sensors_kinect_depthmap.yaml b/config/sensors_kinect_depthmap.yaml → ros1/config/sensors_kinect_depthmap.yaml
diff --git a/config/sensors_kinect_pointcloud.yaml → ros1/config/sensors_kinect_pointcloud.yaml b/config/sensors_kinect_pointcloud.yaml → ros1/config/sensors_kinect_pointcloud.yaml
diff --git a/config/simple_moveit_controllers.yaml → ros1/config/simple_moveit_controllers.yaml b/config/simple_moveit_controllers.yaml → ros1/config/simple_moveit_controllers.yaml
diff --git a/config/stomp_planning.yaml → ros1/config/stomp_planning.yaml b/config/stomp_planning.yaml → ros1/config/stomp_planning.yaml
diff --git a/config/trajopt_planning.yaml → ros1/config/trajopt_planning.yaml b/config/trajopt_planning.yaml → ros1/config/trajopt_planning.yaml
diff --git a/launch/chomp_planning_pipeline.launch.xml → ...launch/chomp_planning_pipeline.launch.xml b/launch/chomp_planning_pipeline.launch.xml → ...launch/chomp_planning_pipeline.launch.xml
diff --git a/launch/default_warehouse_db.launch → ros1/launch/default_warehouse_db.launch b/launch/default_warehouse_db.launch → ros1/launch/default_warehouse_db.launch
diff --git a/launch/demo.launch → ros1/launch/demo.launch b/launch/demo.launch → ros1/launch/demo.launch
diff --git a/launch/demo_chomp.launch → ros1/launch/demo_chomp.launch b/launch/demo_chomp.launch → ros1/launch/demo_chomp.launch
diff --git a/launch/demo_gazebo.launch → ros1/launch/demo_gazebo.launch b/launch/demo_gazebo.launch → ros1/launch/demo_gazebo.launch
diff --git a/launch/demo_lerp.launch → ros1/launch/demo_lerp.launch b/launch/demo_lerp.launch → ros1/launch/demo_lerp.launch
diff --git a/launch/demo_stomp.launch → ros1/launch/demo_stomp.launch b/launch/demo_stomp.launch → ros1/launch/demo_stomp.launch
diff --git a/...fake_moveit_controller_manager.launch.xml → ...fake_moveit_controller_manager.launch.xml b/...fake_moveit_controller_manager.launch.xml → ...fake_moveit_controller_manager.launch.xml
diff --git a/launch/franka_control.launch → ros1/launch/franka_control.launch b/launch/franka_control.launch → ros1/launch/franka_control.launch
diff --git a/launch/joystick_control.launch → ros1/launch/joystick_control.launch b/launch/joystick_control.launch → ros1/launch/joystick_control.launch
diff --git a/launch/lerp_planning_pipeline.launch.xml → .../launch/lerp_planning_pipeline.launch.xml b/launch/lerp_planning_pipeline.launch.xml → .../launch/lerp_planning_pipeline.launch.xml
diff --git a/launch/move_group.launch → ros1/launch/move_group.launch b/launch/move_group.launch → ros1/launch/move_group.launch
diff --git a/launch/moveit.rviz → ros1/launch/moveit.rviz b/launch/moveit.rviz → ros1/launch/moveit.rviz
diff --git a/launch/moveit_empty.rviz → ros1/launch/moveit_empty.rviz b/launch/moveit_empty.rviz → ros1/launch/moveit_empty.rviz
diff --git a/launch/moveit_rviz.launch → ros1/launch/moveit_rviz.launch b/launch/moveit_rviz.launch → ros1/launch/moveit_rviz.launch
diff --git a/launch/moveit_scene.rviz → ros1/launch/moveit_scene.rviz b/launch/moveit_scene.rviz → ros1/launch/moveit_scene.rviz
diff --git a/...h/ompl-chomp_planning_pipeline.launch.xml → ...h/ompl-chomp_planning_pipeline.launch.xml b/...h/ompl-chomp_planning_pipeline.launch.xml → ...h/ompl-chomp_planning_pipeline.launch.xml
diff --git a/launch/ompl_planning_pipeline.launch.xml → .../launch/ompl_planning_pipeline.launch.xml b/launch/ompl_planning_pipeline.launch.xml → .../launch/ompl_planning_pipeline.launch.xml
diff --git a/...ch/panda_moveit_sensor_manager.launch.xml → ...ch/panda_moveit_sensor_manager.launch.xml b/...ch/panda_moveit_sensor_manager.launch.xml → ...ch/panda_moveit_sensor_manager.launch.xml
diff --git a/...tion_planner_planning_pipeline.launch.xml → ...tion_planner_planning_pipeline.launch.xml b/...tion_planner_planning_pipeline.launch.xml → ...tion_planner_planning_pipeline.launch.xml
diff --git a/launch/planning_context.launch → ros1/launch/planning_context.launch b/launch/planning_context.launch → ros1/launch/planning_context.launch
diff --git a/launch/planning_pipeline.launch.xml → ros1/launch/planning_pipeline.launch.xml b/launch/planning_pipeline.launch.xml → ros1/launch/planning_pipeline.launch.xml
diff --git a/...trol_moveit_controller_manager.launch.xml → ...trol_moveit_controller_manager.launch.xml b/...trol_moveit_controller_manager.launch.xml → ...trol_moveit_controller_manager.launch.xml
diff --git a/launch/ros_controllers.launch → ros1/launch/ros_controllers.launch b/launch/ros_controllers.launch → ros1/launch/ros_controllers.launch
diff --git a/launch/run_benchmark_ompl.launch → ros1/launch/run_benchmark_ompl.launch b/launch/run_benchmark_ompl.launch → ros1/launch/run_benchmark_ompl.launch
diff --git a/launch/run_benchmark_trajopt.launch → ros1/launch/run_benchmark_trajopt.launch b/launch/run_benchmark_trajopt.launch → ros1/launch/run_benchmark_trajopt.launch
diff --git a/launch/sensor_manager.launch.xml → ros1/launch/sensor_manager.launch.xml b/launch/sensor_manager.launch.xml → ros1/launch/sensor_manager.launch.xml
diff --git a/launch/setup_assistant.launch → ros1/launch/setup_assistant.launch b/launch/setup_assistant.launch → ros1/launch/setup_assistant.launch
diff --git a/...mple_moveit_controller_manager.launch.xml → ...mple_moveit_controller_manager.launch.xml b/...mple_moveit_controller_manager.launch.xml → ...mple_moveit_controller_manager.launch.xml
diff --git a/launch/stomp_planning_pipeline.launch.xml → ...launch/stomp_planning_pipeline.launch.xml b/launch/stomp_planning_pipeline.launch.xml → ...launch/stomp_planning_pipeline.launch.xml
diff --git a/launch/trajectory_execution.launch.xml → ros1/launch/trajectory_execution.launch.xml b/launch/trajectory_execution.launch.xml → ros1/launch/trajectory_execution.launch.xml
diff --git a/launch/trajopt_planning_pipeline.launch.xml → ...unch/trajopt_planning_pipeline.launch.xml b/launch/trajopt_planning_pipeline.launch.xml → ...unch/trajopt_planning_pipeline.launch.xml
diff --git a/launch/warehouse.launch → ros1/launch/warehouse.launch b/launch/warehouse.launch → ros1/launch/warehouse.launch
diff --git a/launch/warehouse_settings.launch.xml → ros1/launch/warehouse_settings.launch.xml b/launch/warehouse_settings.launch.xml → ros1/launch/warehouse_settings.launch.xml
diff --git a/ros1/readme.md b/ros1/readme.md
@@ -0,0 +1,2 @@
+Files in this folder (panda_moveit_config/launch/ros1) are the ones generated by moveit_setup_assistant and/or made during ros1 era, as opposed to the files panda_moveit_config/launch are the ones initially generated by moveit_setup_assistant 2.5.4 on ROS Humble.
+Since they may be still functional and useful, they may not be fully tested, hence kept in this separate folder so that they are easily identified.