From 674c57b3cc7dc2a1ce085f1d87d80e19ea26ccff Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:55:08 -0500 Subject: [PATCH 1/5] Do not use all planners except for constrained planning (#198) --- .../objectives/3_waypoint_pick_and_place.xml | 18 +++++++++--------- .../objectives/cycle_between_waypoints.xml | 4 ++-- .../objectives/move_to_joint_state.xml | 2 +- .../objectives/3_waypoint_pick_and_place.xml | 18 +++++++++--------- .../objectives/object_inspection.xml | 2 +- .../objectives/3_waypoint_pick_and_place.xml | 18 +++++++++--------- .../objectives/cycle_between_waypoints.xml | 4 ++-- .../objectives/joint_diagnostic.xml | 6 +++--- .../looping_pick_and_place_object.xml | 8 ++++---- .../objectives/open_door_fixed_handle_ml.xml | 6 +++--- .../objectives/open_door_lever_handle_ml.xml | 2 +- .../objectives/pick_place_object.xml | 6 +++--- .../objectives/push_button_ml.xml | 2 +- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/picknik_ur_base_config/objectives/3_waypoint_pick_and_place.xml b/src/picknik_ur_base_config/objectives/3_waypoint_pick_and_place.xml index 83ea1374..84efe835 100644 --- a/src/picknik_ur_base_config/objectives/3_waypoint_pick_and_place.xml +++ b/src/picknik_ur_base_config/objectives/3_waypoint_pick_and_place.xml @@ -5,28 +5,28 @@ - + - + - - + + - + - + - - + + - + diff --git a/src/picknik_ur_base_config/objectives/cycle_between_waypoints.xml b/src/picknik_ur_base_config/objectives/cycle_between_waypoints.xml index 7dbaf01c..62c970bf 100644 --- a/src/picknik_ur_base_config/objectives/cycle_between_waypoints.xml +++ b/src/picknik_ur_base_config/objectives/cycle_between_waypoints.xml @@ -3,8 +3,8 @@ - - + + diff --git a/src/picknik_ur_base_config/objectives/move_to_joint_state.xml b/src/picknik_ur_base_config/objectives/move_to_joint_state.xml index d4cf6533..5a0bc540 100644 --- a/src/picknik_ur_base_config/objectives/move_to_joint_state.xml +++ b/src/picknik_ur_base_config/objectives/move_to_joint_state.xml @@ -6,7 +6,7 @@ - + diff --git a/src/picknik_ur_gazebo_config/objectives/3_waypoint_pick_and_place.xml b/src/picknik_ur_gazebo_config/objectives/3_waypoint_pick_and_place.xml index d1a2b3c9..9ee8b91c 100644 --- a/src/picknik_ur_gazebo_config/objectives/3_waypoint_pick_and_place.xml +++ b/src/picknik_ur_gazebo_config/objectives/3_waypoint_pick_and_place.xml @@ -5,28 +5,28 @@ - + - + - - + + - + - + - - + + - + diff --git a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml index 4053eaa0..0faa42d1 100644 --- a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml +++ b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml @@ -10,7 +10,7 @@ - + diff --git a/src/picknik_ur_mock_hw_config/objectives/3_waypoint_pick_and_place.xml b/src/picknik_ur_mock_hw_config/objectives/3_waypoint_pick_and_place.xml index ffabac9d..61c2b4ea 100644 --- a/src/picknik_ur_mock_hw_config/objectives/3_waypoint_pick_and_place.xml +++ b/src/picknik_ur_mock_hw_config/objectives/3_waypoint_pick_and_place.xml @@ -5,28 +5,28 @@ - + - + - - + + - + - + - - + + - + diff --git a/src/picknik_ur_mock_hw_config/objectives/cycle_between_waypoints.xml b/src/picknik_ur_mock_hw_config/objectives/cycle_between_waypoints.xml index 9eb88bfa..ca5b5392 100644 --- a/src/picknik_ur_mock_hw_config/objectives/cycle_between_waypoints.xml +++ b/src/picknik_ur_mock_hw_config/objectives/cycle_between_waypoints.xml @@ -3,8 +3,8 @@ - - + + diff --git a/src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml b/src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml index de502164..a3c1f3f1 100644 --- a/src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml +++ b/src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml @@ -3,11 +3,11 @@ - + - - + + diff --git a/src/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml b/src/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml index e47dba1d..4dff542a 100644 --- a/src/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml +++ b/src/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml @@ -10,7 +10,7 @@ - + @@ -71,14 +71,14 @@ - + - + - + diff --git a/src/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml b/src/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml index 22f6b8ba..4ced5725 100644 --- a/src/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml +++ b/src/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml @@ -9,7 +9,7 @@ - + @@ -18,11 +18,11 @@ - + - + diff --git a/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml b/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml index 73c7ea37..9c7ad3d0 100644 --- a/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml +++ b/src/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml @@ -9,7 +9,7 @@ - + diff --git a/src/picknik_ur_site_config/objectives/pick_place_object.xml b/src/picknik_ur_site_config/objectives/pick_place_object.xml index b711a5b4..052abc7a 100644 --- a/src/picknik_ur_site_config/objectives/pick_place_object.xml +++ b/src/picknik_ur_site_config/objectives/pick_place_object.xml @@ -94,15 +94,15 @@ - + - + - + diff --git a/src/picknik_ur_site_config/objectives/push_button_ml.xml b/src/picknik_ur_site_config/objectives/push_button_ml.xml index 1900dc7e..b4aab8e3 100644 --- a/src/picknik_ur_site_config/objectives/push_button_ml.xml +++ b/src/picknik_ur_site_config/objectives/push_button_ml.xml @@ -4,7 +4,7 @@ - + From 68cfd07ff7d5c175064a2cb2084f1140163f5d76 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:57:13 -0500 Subject: [PATCH 2/5] Remove hack to get around double-counted serial package installs (#201) --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b8c1e4f..2ce7de91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,12 +61,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --from-paths src \ --ignore-src -# Remove duplicated serial dependency install files, otherwise there will be a build error. -# NOTE: This can be removed when MoveIt Pro fully separates core and hardware capabilities. -WORKDIR /opt/overlay_ws -RUN rm -rf build/serial install/serial - - ################################################################### # Target for the developer build which does not compile any code. # ################################################################### From afd2886fb782cd3be49491fe968240f6abeb27d9 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:45:44 -0500 Subject: [PATCH 3/5] Add ML tutorial Objectives (#202) --- .../objectives/object_segmentation_2d.xml | 11 ++++++++ .../objectives/object_segmentation_3d.xml | 26 +++++++++++++++++++ .../waypoints/waypoints.yaml | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/picknik_ur_gazebo_config/objectives/object_segmentation_2d.xml create mode 100644 src/picknik_ur_gazebo_config/objectives/object_segmentation_3d.xml diff --git a/src/picknik_ur_gazebo_config/objectives/object_segmentation_2d.xml b/src/picknik_ur_gazebo_config/objectives/object_segmentation_2d.xml new file mode 100644 index 00000000..df22312e --- /dev/null +++ b/src/picknik_ur_gazebo_config/objectives/object_segmentation_2d.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/picknik_ur_gazebo_config/objectives/object_segmentation_3d.xml b/src/picknik_ur_gazebo_config/objectives/object_segmentation_3d.xml new file mode 100644 index 00000000..6ae17d28 --- /dev/null +++ b/src/picknik_ur_gazebo_config/objectives/object_segmentation_3d.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml b/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml index 660a14b8..a5c92532 100644 --- a/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml +++ b/src/picknik_ur_gazebo_config/waypoints/waypoints.yaml @@ -349,7 +349,7 @@ velocity: [] name: Monitor View - description: '' - favorite: true + favorite: false joint_state: effort: [] header: From 716efce6c33f1d3489a8617b3248977e5c624ee7 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Thu, 8 Feb 2024 04:57:06 -0500 Subject: [PATCH 4/5] Start Teleoperate Objective in Waypoint mode (#203) --- src/picknik_ur_base_config/objectives/teleoperate.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/picknik_ur_base_config/objectives/teleoperate.xml b/src/picknik_ur_base_config/objectives/teleoperate.xml index 0af0e032..f9b45da4 100644 --- a/src/picknik_ur_base_config/objectives/teleoperate.xml +++ b/src/picknik_ur_base_config/objectives/teleoperate.xml @@ -2,6 +2,6 @@ - + From 4eb3eca2c6fbd28f70f54e4db61d8a96b38e318c Mon Sep 17 00:00:00 2001 From: Mario Prats Date: Thu, 8 Feb 2024 14:07:13 +0100 Subject: [PATCH 5/5] update paths in scan_and_plan objective (#204) --- .../objectives/object_inspection.xml | 4 ++-- .../objectives/object_registration.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml index 0faa42d1..0a2b3251 100644 --- a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml +++ b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_inspection.xml @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_registration.xml b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_registration.xml index fe9b0818..e2d0503d 100644 --- a/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_registration.xml +++ b/src/picknik_ur_gazebo_scan_and_plan_config/objectives/object_registration.xml @@ -5,7 +5,7 @@ - +