From 730b2b21fd826c06027a66d3fa384f003549441f Mon Sep 17 00:00:00 2001 From: Cassidy Elliott Date: Fri, 23 Jun 2023 14:36:22 -0600 Subject: [PATCH 1/4] Update ur5e_waypoints.yaml --- .../waypoints/ur5e_waypoints.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/picknik_ur_base_config/waypoints/ur5e_waypoints.yaml b/src/picknik_ur_base_config/waypoints/ur5e_waypoints.yaml index 0f9dd357..b2c09786 100644 --- a/src/picknik_ur_base_config/waypoints/ur5e_waypoints.yaml +++ b/src/picknik_ur_base_config/waypoints/ur5e_waypoints.yaml @@ -23,6 +23,18 @@ position: [3.03, -0.78, -0.51, -2.39, 1.65, 0] velocity: [] effort: [] +- name: Look at Pick and Place Zone + favorite: true + joint_state: + header: + frame_id: world + stamp: + sec: 0 + nanosec: 0 + name: [shoulder_pan_joint, shoulder_lift_joint, elbow_joint, wrist_1_joint, wrist_2_joint, wrist_3_joint] + position: [3.03, -0.78, -0.51, -2.39, 1.65, 0] + velocity: [] + effort: [] - name: Forward Down favorite: true joint_state: From 4104d738193c87e068cce125895f66bcb895472f Mon Sep 17 00:00:00 2001 From: Cassidy Elliott Date: Fri, 23 Jun 2023 14:37:28 -0600 Subject: [PATCH 2/4] Update waypoints.yaml --- .../waypoints/waypoints.yaml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml b/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml index a645f48f..dba9c62b 100644 --- a/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml +++ b/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml @@ -148,6 +148,31 @@ - 0 velocity: [] name: Look at Table +- description: '' + favorite: true + joint_state: + effort: [] + header: + frame_id: world + stamp: + nanosec: 0 + sec: 0 + name: + - shoulder_pan_joint + - shoulder_lift_joint + - elbow_joint + - wrist_1_joint + - wrist_2_joint + - wrist_3_joint + position: + - 3.03 + - -0.78 + - -0.51 + - -2.39 + - 1.65 + - 0 + velocity: [] + name: Look at Pick and Place Zone - description: '' favorite: false joint_state: From b00874550e682caa7cbcd57cabb21a2ef84a2093 Mon Sep 17 00:00:00 2001 From: Cassidy Elliott Date: Fri, 23 Jun 2023 14:38:24 -0600 Subject: [PATCH 3/4] Update looping_pick_and_place_object.xml --- .../objectives/looping_pick_and_place_object.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/picknik_ur_base_config/objectives/looping_pick_and_place_object.xml b/src/picknik_ur_base_config/objectives/looping_pick_and_place_object.xml index 4ebc1b5b..c8845223 100644 --- a/src/picknik_ur_base_config/objectives/looping_pick_and_place_object.xml +++ b/src/picknik_ur_base_config/objectives/looping_pick_and_place_object.xml @@ -10,7 +10,7 @@ - + @@ -69,14 +69,14 @@ - + - + @@ -84,7 +84,7 @@ - + From 2784507104501a4933309b789d3514fde4daf9dc Mon Sep 17 00:00:00 2001 From: Cassidy Elliott Date: Fri, 23 Jun 2023 14:39:07 -0600 Subject: [PATCH 4/4] Update pick_place_object.xml --- .../objectives/pick_place_object.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/picknik_ur_base_config/objectives/pick_place_object.xml b/src/picknik_ur_base_config/objectives/pick_place_object.xml index 03e3d122..49a76a1c 100644 --- a/src/picknik_ur_base_config/objectives/pick_place_object.xml +++ b/src/picknik_ur_base_config/objectives/pick_place_object.xml @@ -95,17 +95,17 @@ - + - + - + - +