From de4b9798194ffcf18af05c21d72921b7cc15964b Mon Sep 17 00:00:00 2001 From: "David V. Lu!!" Date: Tue, 10 May 2022 08:04:32 -0400 Subject: [PATCH] [MSA] Generate More New Launch Files (#1213) --- .../moveit_setup_app_plugins/src/launches.cpp | 13 +++ .../src/srdf_config.cpp | 10 -- .../launch/chomp_planning_pipeline.launch.xml | 23 ---- .../templates/launch/demo.launch | 68 ------------ .../templates/launch/move_group.launch | 101 ------------------ .../launch/ompl_planning_pipeline.launch.xml | 26 ----- ...otion_planner_planning_pipeline.launch.xml | 15 --- .../templates/launch/planning_context.launch | 26 ----- .../launch/planning_pipeline.launch.xml | 10 -- .../templates/launch/ros_controllers.launch | 11 -- .../launch/trajectory_execution.launch.xml | 23 ---- .../trajopt_planning_pipeline.launch.xml | 29 ----- 12 files changed, 13 insertions(+), 342 deletions(-) delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/chomp_planning_pipeline.launch.xml delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/demo.launch delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/move_group.launch delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/ompl_planning_pipeline.launch.xml delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/planning_context.launch delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/planning_pipeline.launch.xml delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/ros_controllers.launch delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/trajectory_execution.launch.xml delete mode 100644 moveit_setup_assistant/old_assistant/templates/launch/trajopt_planning_pipeline.launch.xml diff --git a/moveit_setup_assistant/moveit_setup_app_plugins/src/launches.cpp b/moveit_setup_assistant/moveit_setup_app_plugins/src/launches.cpp index f3d5a3f2a0..38a19183a6 100644 --- a/moveit_setup_assistant/moveit_setup_app_plugins/src/launches.cpp +++ b/moveit_setup_assistant/moveit_setup_app_plugins/src/launches.cpp @@ -53,6 +53,19 @@ void Launches::onInit() "moveit_rviz", { "rviz2", "rviz_common", "rviz_default_plugins", "moveit_ros_visualization" })); available_launch_bundles_.back().addFile( "config/moveit.rviz", "Configuration file for Rviz with the Motion Planning Plugin already setup."); + available_launch_bundles_.push_back(LaunchBundle( + "MoveGroup Launch", "Launch file to run the main MoveIt executable that provides the MoveGroup action", + "move_group", { "moveit_ros_move_group" })); + available_launch_bundles_.push_back(LaunchBundle("Static TF Launch", + "Launch file to broadcast static TF for the robot's virtual joints.", + "static_virtual_joint_tfs", { "tf2_ros" })); + available_launch_bundles_.push_back(LaunchBundle("Spawn Controllers Launch", + "Launch file to spawn the necessary controllers", + "spawn_controllers", { "controller_manager" })); + available_launch_bundles_.push_back(LaunchBundle("Demo Launch", + "Launch file to run a demo of MoveGroup. Warning that it requires " + "the above launch files to all be generated as well.", + "demo")); available_launch_bundles_.push_back(LaunchBundle("Setup Assistant Launch", "Launch file for easily re-starting the MoveIt " diff --git a/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp b/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp index 14d585413d..670cf763da 100644 --- a/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp +++ b/moveit_setup_assistant/moveit_setup_framework/src/srdf_config.cpp @@ -198,16 +198,6 @@ void SRDFConfig::collectVariables(std::vector& variables) variables.push_back(TemplateVariable("ROBOT_NAME", srdf_.robot_name_)); variables.push_back(TemplateVariable("ROBOT_ROOT_LINK", robot_model_->getRootLinkName())); variables.push_back(TemplateVariable("PLANNING_FRAME", robot_model_->getModelFrame())); - - std::stringstream vjb; - unsigned int counter = 0; - for (const auto& vj : srdf_.virtual_joints_) - { - vjb << " " << std::endl; - counter++; - } - variables.push_back(TemplateVariable("VIRTUAL_JOINT_BROADCASTER", vjb.str())); } } // namespace moveit_setup_framework diff --git a/moveit_setup_assistant/old_assistant/templates/launch/chomp_planning_pipeline.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/chomp_planning_pipeline.launch.xml deleted file mode 100644 index 3b47012050..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/chomp_planning_pipeline.launch.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/demo.launch b/moveit_setup_assistant/old_assistant/templates/launch/demo.launch deleted file mode 100644 index 837ffb93f7..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/demo.launch +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -[VIRTUAL_JOINT_BROADCASTER] - - - - - - [move_group/fake_controller_joint_states] - - - - [move_group/fake_controller_joint_states] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/move_group.launch b/moveit_setup_assistant/old_assistant/templates/launch/move_group.launch deleted file mode 100644 index 3e27d9b9e9..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/move_group.launch +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/ompl_planning_pipeline.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/ompl_planning_pipeline.launch.xml deleted file mode 100644 index afbdf88d25..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/ompl_planning_pipeline.launch.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml deleted file mode 100644 index c7c4cf5005..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/planning_context.launch b/moveit_setup_assistant/old_assistant/templates/launch/planning_context.launch deleted file mode 100644 index 635179b3b8..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/planning_context.launch +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -[KINEMATICS_PARAMETERS_FILE_NAMES_BLOCK] - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/planning_pipeline.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/planning_pipeline.launch.xml deleted file mode 100644 index 4b4d0d663a..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/planning_pipeline.launch.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/ros_controllers.launch b/moveit_setup_assistant/old_assistant/templates/launch/ros_controllers.launch deleted file mode 100644 index 77e6addd7e..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/ros_controllers.launch +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/trajectory_execution.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/trajectory_execution.launch.xml deleted file mode 100644 index 20c3dfc459..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/trajectory_execution.launch.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/moveit_setup_assistant/old_assistant/templates/launch/trajopt_planning_pipeline.launch.xml b/moveit_setup_assistant/old_assistant/templates/launch/trajopt_planning_pipeline.launch.xml deleted file mode 100644 index 0df0ff6f2b..0000000000 --- a/moveit_setup_assistant/old_assistant/templates/launch/trajopt_planning_pipeline.launch.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -