Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup moveit_config #57

Merged
merged 1 commit into from
Jan 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions abb_bringup/launch/abb_moveit.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,16 @@ def launch_setup(context, *args, **kwargs):
"kinematics.yaml",
)
)
# MoveIt does not handle controller switching automatically
.trajectory_execution(
file_path=os.path.join(
get_package_share_directory(
f"{moveit_config_package.perform(context)}"
),
"config",
"moveit_controllers.yaml",
)
),
moveit_manage_controllers=False,
)
.planning_scene_monitor(
publish_planning_scene=True,
Expand All @@ -90,23 +92,12 @@ def launch_setup(context, *args, **kwargs):
.to_moveit_configs()
)

# MoveIt controllers
moveit_controllers = {
"moveit_simple_controller_manager": load_yaml(
f"{moveit_config_package.perform(context)}",
"config/moveit_controllers.yaml",
),
"moveit_controller_manager": "moveit_simple_controller_manager/MoveItSimpleControllerManager",
}

# Start the actual move_group node/action server
move_group_node = Node(
package="moveit_ros_move_group",
executable="move_group",
output="screen",
parameters=[
moveit_config.trajectory_execution,
moveit_controllers,
moveit_config.to_dict(),
],
)
Expand Down
Loading