Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Default initial positions for ur's ros2_control fake system

initial_positions:
elbow_joint: 0
shoulder_lift_joint: 0
shoulder_pan_joint: 0
wrist_1_joint: 0
wrist_2_joint: 0
wrist_3_joint: 0
# Initial positions for fake hardware simulation
# Joint angles: [79.72, -69.5, -81.91, -117.92, -268.05, -157.15] degrees
shoulder_pan_joint: 1.3914
shoulder_lift_joint: -1.2132
elbow_joint: -1.4297
wrist_1_joint: -2.0584
wrist_2_joint: -4.6783
wrist_3_joint: -2.7430
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@ joint_limits:
elbow_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_lift_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_pan_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_1_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_2_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_3_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ planner_configs:
RRTConnectkConfigDefault:
type: geometric::RRTConnect
range: 0.0
goal_bias: 0.15 # Higher = more direct paths (default 0.05)
# goal_tolerance: 0.01
# num_planning_attempts: 10
# planning_time: 10.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
planning_plugin: pilz_industrial_motion_planner/CommandPlanner
request_adapters: >-
default_planner_request_adapters/FixWorkspaceBounds
default_planner_request_adapters/FixStartStateBounds
default_planner_request_adapters/FixStartStateCollision
default_planner_request_adapters/FixStartStatePathConstraints
default_planner_config: PTP
capabilities: >-
pilz_industrial_motion_planner/MoveGroupSequenceAction
pilz_industrial_motion_planner/MoveGroupSequenceService
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<joint name="shoulder_pan_joint" value="0"/>
<joint name="wrist_1_joint" value="0"/>
<joint name="wrist_2_joint" value="0"/>
<joint name="wrist_3_joint" value="0"/>
<joint name="wrist_3_joint" value="-3.14159"/>
</group_state>
<!--VIRTUAL JOINT: Purpose: this element defines a virtual joint between a robot link and an external frame of reference (considered fixed with respect to the robot)-->
<virtual_joint name="virtual_joint" type="fixed" parent_frame="map" child_link="map"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def generate_launch_description():
.planning_scene_monitor(
publish_robot_description=True, publish_robot_description_semantic=True
)
.planning_pipelines(pipelines=["ompl"])
.planning_pipelines(pipelines=["ompl", "pilz_industrial_motion_planner"])
.to_moveit_configs()
)
# Load ExecuteTaskSolutionCapability so we can execute found solutions in simulation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Default initial positions for ur's ros2_control fake system

initial_positions:
elbow_joint: 0
gripper: 0
shoulder_lift_joint: 0
shoulder_pan_joint: 0
wrist_1_joint: 0
wrist_2_joint: 0
wrist_3_joint: 0
# Initial positions for fake hardware simulation
# Joint angles: [79.72, -69.5, -81.91, -117.92, -268.05, -157.15] degrees
shoulder_pan_joint: 1.3914
shoulder_lift_joint: -1.2132
elbow_joint: -1.4297
wrist_1_joint: -2.0584
wrist_2_joint: -4.6783
wrist_3_joint: -2.7430
gripper: 0.0
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@ joint_limits:
elbow_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
gripper:
has_velocity_limits: true
max_velocity: 1.0
has_acceleration_limits: false
max_acceleration: 0.0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_lift_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_pan_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_1_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_2_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_3_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ planner_configs:
RRTConnectkConfigDefault:
type: geometric::RRTConnect
range: 0.0
goal_bias: 0.15 # Higher = more direct paths (default 0.05)
RRTstar:
type: geometric::RRTstar
range: 1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
planning_plugin: pilz_industrial_motion_planner/CommandPlanner
request_adapters: >-
default_planner_request_adapters/FixWorkspaceBounds
default_planner_request_adapters/FixStartStateBounds
default_planner_request_adapters/FixStartStateCollision
default_planner_request_adapters/FixStartStatePathConstraints
default_planner_config: PTP
capabilities: >-
pilz_industrial_motion_planner/MoveGroupSequenceAction
pilz_industrial_motion_planner/MoveGroupSequenceService
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<joint name="shoulder_pan_joint" value="0"/>
<joint name="wrist_1_joint" value="0"/>
<joint name="wrist_2_joint" value="0"/>
<joint name="wrist_3_joint" value="0"/>
<joint name="wrist_3_joint" value="-3.14159"/>
</group_state>
<group_state name="vacuum_on" group="epick_gripper">
<joint name="gripper" value="1"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def generate_launch_description():
"description_file": LaunchConfiguration("description_file"),
"controllers_file": LaunchConfiguration("controllers_file"),
"kinematics_params_file": os.path.join(get_package_share_directory("ur5e_robot_description"), "config", "ur5e_calibration.yaml"),
"use_tool_communication": "true", # Enable to make tool_voltage parameter work
"use_tool_communication": "false", # We launch our own tool_communication node with delay
"tool_voltage": "24",
}.items()
)
Expand All @@ -51,7 +51,7 @@ def generate_launch_description():
.planning_scene_monitor(
publish_robot_description=True, publish_robot_description_semantic=True
)
.planning_pipelines(pipelines=["ompl"])
.planning_pipelines(pipelines=["ompl", "pilz_industrial_motion_planner"])
.to_moveit_configs()
)
# Load ExecuteTaskSolutionCapability so we can execute found solutions in simulation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Default initial positions for ur's ros2_control fake system

initial_positions:
elbow_joint: 0
robotiq_hande_left_finger_joint: 0
shoulder_lift_joint: 0
shoulder_pan_joint: 0
wrist_1_joint: 0
wrist_2_joint: 0
wrist_3_joint: 0
# Initial positions for fake hardware simulation
# Joint angles: [79.72, -69.5, -81.91, -117.92, -268.05, -157.15] degrees
shoulder_pan_joint: 1.3914
shoulder_lift_joint: -1.2132
elbow_joint: -1.4297
wrist_1_joint: -2.0584
wrist_2_joint: -4.6783
wrist_3_joint: -2.7430
robotiq_hande_left_finger_joint: 0.0
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,40 @@ joint_limits:
elbow_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
robotiq_hande_left_finger_joint:
has_velocity_limits: true
max_velocity: 0.14999999999999999
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
robotiq_hande_right_finger_joint:
has_velocity_limits: true
max_velocity: 0.14999999999999999
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_lift_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
shoulder_pan_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_1_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_2_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
wrist_3_joint:
has_velocity_limits: true
max_velocity: 3.1415926535897931
has_acceleration_limits: false
max_acceleration: 0
has_acceleration_limits: true
max_acceleration: 5.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ planner_configs:
RRTConnectkConfigDefault:
type: geometric::RRTConnect
range: 0.0
goal_bias: 0.15 # Higher = more direct paths (default 0.05)
RRTstar:
type: geometric::RRTstar
range: 1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
planning_plugin: pilz_industrial_motion_planner/CommandPlanner
request_adapters: >-
default_planner_request_adapters/FixWorkspaceBounds
default_planner_request_adapters/FixStartStateBounds
default_planner_request_adapters/FixStartStateCollision
default_planner_request_adapters/FixStartStatePathConstraints
default_planner_config: PTP
capabilities: >-
pilz_industrial_motion_planner/MoveGroupSequenceAction
pilz_industrial_motion_planner/MoveGroupSequenceService
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<joint name="shoulder_pan_joint" value="0"/>
<joint name="wrist_1_joint" value="0"/>
<joint name="wrist_2_joint" value="0"/>
<joint name="wrist_3_joint" value="0"/>
<joint name="wrist_3_joint" value="-3.14159"/>
</group_state>
<group_state name="hande_open" group="hande_gripper">
<joint name="robotiq_hande_left_finger_joint" value="0.025"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def generate_launch_description():
.planning_scene_monitor(
publish_robot_description=True, publish_robot_description_semantic=True
)
.planning_pipelines(pipelines=["ompl"])
.planning_pipelines(pipelines=["ompl", "pilz_industrial_motion_planner"])
.to_moveit_configs()
)
# Load ExecuteTaskSolutionCapability so we can execute found solutions in simulation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Default initial positions for ur's ros2_control fake system

initial_positions:
elbow_joint: 0
# Pipettor has no movable joints controlled by MoveIt
shoulder_lift_joint: 0
shoulder_pan_joint: 0
wrist_1_joint: 0
wrist_2_joint: 0
wrist_3_joint: 0
# Initial positions for fake hardware simulation
# Joint angles: [79.72, -69.5, -81.91, -117.92, -268.05, -157.15] degrees
shoulder_pan_joint: 1.3914
shoulder_lift_joint: -1.2132
elbow_joint: -1.4297
wrist_1_joint: -2.0584
wrist_2_joint: -4.6783
wrist_3_joint: -2.7430
Loading
Loading