Compare commits

..

2 Commits

Author SHA1 Message Date
4ccb41cfd9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	franka_moveit_config/launch/moveit_without_hand.launch.py
2023-09-05 15:46:18 +02:00
f74720128b moveit_interface.cpp works 2023-09-05 15:45:59 +02:00

View File

@ -210,12 +210,17 @@ def generate_launch_description():
moveit_interface = Node(
package='franka_moveit_interface',
executable='moveit_interface',
executable='franka_moveit_interface',
name='franka_moveit_interface',
output='screen',
parameters=[
robot_description,
robot_description_semantic,
kinematics_yaml,
ompl_planning_pipeline_config,
trajectory_execution,
moveit_controllers,
planning_scene_monitor_parameters,
],
)