From b00dc79bbe9d35596f4a717564f474809238bb93 Mon Sep 17 00:00:00 2001 From: Dave Coleman Date: Wed, 1 Apr 2026 23:42:50 -0600 Subject: [PATCH 1/3] feat(lab_sim): Add lab desk objects and update objectives Add desk objects (microscope, bottle) to lab_sim scene, adjust collision wall/tray positions, update waypoints and objective configurations. Switch MPC pose tracking objective to use wrist camera and update square trajectory. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/lab_sim/description/assets/bottle.stl | 3 + src/lab_sim/description/assets/microscope.stl | 3 + src/lab_sim/description/keyboard-texture.png | 3 + src/lab_sim/description/laptop-screen.png | 3 + src/lab_sim/description/picknik_ur.xacro | 12 +- src/lab_sim/description/scene.xml | 1037 +- .../objectives/3_waypoint_pick_and_place.xml | 18 +- .../objectives/classical_pick_and_place.xml | 114 - .../computelinkposefromwaypoint.xml | 2 +- .../constrained_pick_and_place_subtree.xml | 327 +- .../objectives/constrained_pick_place.xml | 53 - .../objectives/create_pcl_poses_vector.xml | 12 +- src/lab_sim/objectives/grasp_planning.xml | 4 +- .../grasp_pose_tuning_with_april_tag.xml | 2 +- .../objectives/grasp_pose_using_yaml.xml | 2 +- .../objectives/move_flasks_to_burners.xml | 33 + src/lab_sim/objectives/mpc_pose_tracking.xml | 4 +- ...loud_avoidance_with_sphere_down_sample.xml | 6 +- ...loud_avoidance_with_sphere_down_sample.xml | 8 +- ...th_static_sphere_point_cloud_avoidance.xml | 2 +- ...tle.xml => pick_1_pill_bottle_with_ml.xml} | 14 +- .../pick_all_bottles_with_apriltags.xml | 571 + .../pick_april_tag_object_with_approval.xml | 4 +- src/lab_sim/objectives/pick_object.xml | 2 +- src/lab_sim/objectives/pick_up_cube.xml | 4 +- src/lab_sim/objectives/place_object.xml | 5 +- src/lab_sim/objectives/register_cad_part.xml | 21 +- .../objectives/register_cad_part_subtree.xml | 30 +- src/lab_sim/objectives/square_traj.yaml | 10704 +++++++++++----- .../stitch_multiple_point_clouds_together.xml | 18 +- .../test/objectives_integration_test.py | 45 +- src/lab_sim/waypoints/ur_waypoints.yaml | 645 +- src/picknik_accessories | 2 +- 33 files changed, 9540 insertions(+), 4173 deletions(-) create mode 100644 src/lab_sim/description/assets/bottle.stl create mode 100644 src/lab_sim/description/assets/microscope.stl create mode 100644 src/lab_sim/description/keyboard-texture.png create mode 100644 src/lab_sim/description/laptop-screen.png delete mode 100644 src/lab_sim/objectives/classical_pick_and_place.xml delete mode 100644 src/lab_sim/objectives/constrained_pick_place.xml create mode 100644 src/lab_sim/objectives/move_flasks_to_burners.xml rename src/lab_sim/objectives/{pick_1_pill_bottle.xml => pick_1_pill_bottle_with_ml.xml} (91%) create mode 100644 src/lab_sim/objectives/pick_all_bottles_with_apriltags.xml diff --git a/src/lab_sim/description/assets/bottle.stl b/src/lab_sim/description/assets/bottle.stl new file mode 100644 index 000000000..e4a329ea0 --- /dev/null +++ b/src/lab_sim/description/assets/bottle.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6358a28dd2f70d6552b14d2675c66b5bdf1ee1b5236cb7cca32b8c2e7560c602 +size 6284 diff --git a/src/lab_sim/description/assets/microscope.stl b/src/lab_sim/description/assets/microscope.stl new file mode 100644 index 000000000..a7b48066d --- /dev/null +++ b/src/lab_sim/description/assets/microscope.stl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4739e5c8149f7f74f1765f5fecdfad4bbf566bb1d992662b46f6f9b6be4d67c +size 19951234 diff --git a/src/lab_sim/description/keyboard-texture.png b/src/lab_sim/description/keyboard-texture.png new file mode 100644 index 000000000..9e685eab3 --- /dev/null +++ b/src/lab_sim/description/keyboard-texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0b212c56658ff5e5936f82867413fb357322e432664609c6b496c190925d20c +size 170370 diff --git a/src/lab_sim/description/laptop-screen.png b/src/lab_sim/description/laptop-screen.png new file mode 100644 index 000000000..67982b9f1 --- /dev/null +++ b/src/lab_sim/description/laptop-screen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4045f46ccec667d8c317cde63758d9ab826f8990ebcdee163ca10a0241d52b09 +size 215006 diff --git a/src/lab_sim/description/picknik_ur.xacro b/src/lab_sim/description/picknik_ur.xacro index fe73e3e84..98d1a4342 100644 --- a/src/lab_sim/description/picknik_ur.xacro +++ b/src/lab_sim/description/picknik_ur.xacro @@ -663,7 +663,7 @@ - + @@ -672,7 +672,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -690,7 +690,7 @@ - + @@ -699,7 +699,7 @@ - + @@ -708,7 +708,7 @@ - + diff --git a/src/lab_sim/description/scene.xml b/src/lab_sim/description/scene.xml index 7d896c290..b2e6dc99d 100644 --- a/src/lab_sim/description/scene.xml +++ b/src/lab_sim/description/scene.xml @@ -6,14 +6,96 @@ -