diff --git a/src/factory_sim/config/control/picknik_fanuc.ros2_control.yaml b/src/factory_sim/config/control/picknik_fanuc.ros2_control.yaml index d6d3a08c..ae9a63c1 100644 --- a/src/factory_sim/config/control/picknik_fanuc.ros2_control.yaml +++ b/src/factory_sim/config/control/picknik_fanuc.ros2_control.yaml @@ -81,7 +81,7 @@ joint_trajectory_admittance_controller: # provide the gravity vector in the base frame. gravity_vector: [0.0, 0.0, -9.8] # Default maximum joint-space deviation accepted along the trajectory, if not specified in the goal message. - default_path_tolerance: 0.6 + default_path_tolerance: 0.65 # Default maximum joint-space deviation accepted at the trajectory end-point, if not specified in the goal message. default_goal_tolerance: 0.05 # Default maximum absolute force torque readings allowed from the force torque sensor along each Cartesian space diff --git a/src/factory_sim/description/bracket_collision_geometry_0.xml b/src/factory_sim/description/bracket_collision_geometry_0.xml new file mode 100644 index 00000000..1809bfc3 --- /dev/null +++ b/src/factory_sim/description/bracket_collision_geometry_0.xml @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/factory_sim/description/bracket_collision_geometry_1.xml b/src/factory_sim/description/bracket_collision_geometry_1.xml new file mode 100644 index 00000000..e85d6002 --- /dev/null +++ b/src/factory_sim/description/bracket_collision_geometry_1.xml @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/factory_sim/description/bracket_collision_geometry_2.xml b/src/factory_sim/description/bracket_collision_geometry_2.xml new file mode 100644 index 00000000..28b6b747 --- /dev/null +++ b/src/factory_sim/description/bracket_collision_geometry_2.xml @@ -0,0 +1,553 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/factory_sim/description/scene.xml b/src/factory_sim/description/scene.xml index 2b915924..e3778f58 100644 --- a/src/factory_sim/description/scene.xml +++ b/src/factory_sim/description/scene.xml @@ -4,6 +4,8 @@ + + @@ -234,13 +236,17 @@ - - - - - - - + + + + @@ -414,16 +420,22 @@ - + - - - + + + + diff --git a/src/factory_sim/objectives/pick_up_tool_from_holder.xml b/src/factory_sim/objectives/pick_up_tool_from_holder.xml index 2c78b685..c22189de 100644 --- a/src/factory_sim/objectives/pick_up_tool_from_holder.xml +++ b/src/factory_sim/objectives/pick_up_tool_from_holder.xml @@ -26,6 +26,12 @@ trajectory_monitoring="false" /> + - + diff --git a/src/factory_sim/objectives/retract.xml b/src/factory_sim/objectives/retract.xml index 2b332672..8eed459e 100644 --- a/src/factory_sim/objectives/retract.xml +++ b/src/factory_sim/objectives/retract.xml @@ -24,7 +24,7 @@ acceleration_scale="0.5" axis_x="0.000000" axis_y="0.000000" - ignore_environment_collisions="false" + ignore_environment_collisions="{ignore_environment_collisions}" planning_group_name="manipulator" velocity_scale="0.5" task="{mtc_task}" @@ -44,6 +44,7 @@ +