From 3a955261ac78708813ab759b141dd2545c6abc26 Mon Sep 17 00:00:00 2001 From: Michael Wrock Date: Wed, 1 Jan 2025 12:31:53 -0800 Subject: [PATCH 1/2] Updating apriltag objective --- .../objectives/apriltag_pick_object.xml | 112 ++++-------------- .../pick_april_tag_object_with_approval.xml | 78 +++++------- 2 files changed, 51 insertions(+), 139 deletions(-) diff --git a/src/lab_sim/objectives/apriltag_pick_object.xml b/src/lab_sim/objectives/apriltag_pick_object.xml index 29dc823a..774c72ac 100644 --- a/src/lab_sim/objectives/apriltag_pick_object.xml +++ b/src/lab_sim/objectives/apriltag_pick_object.xml @@ -1,98 +1,34 @@ + - + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + + diff --git a/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml b/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml index 6ca263f1..985130fe 100644 --- a/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml +++ b/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml @@ -1,60 +1,36 @@ - - + + - + - + + + - + - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + From 141fea04067ea726f6643240f7c1247b19ac007f Mon Sep 17 00:00:00 2001 From: Michael Wrock Date: Wed, 1 Jan 2025 12:34:08 -0800 Subject: [PATCH 2/2] updating objective --- .../objectives/apriltag_pick_object.xml | 129 +++++++++++++--- .../pick_april_tag_object_with_approval.xml | 141 ++++++++++++++---- 2 files changed, 219 insertions(+), 51 deletions(-) diff --git a/src/lab_sim/objectives/apriltag_pick_object.xml b/src/lab_sim/objectives/apriltag_pick_object.xml index 774c72ac..9434c0c8 100644 --- a/src/lab_sim/objectives/apriltag_pick_object.xml +++ b/src/lab_sim/objectives/apriltag_pick_object.xml @@ -1,34 +1,115 @@ - + - + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + + + diff --git a/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml b/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml index 985130fe..51e17012 100644 --- a/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml +++ b/src/lab_sim/objectives/pick_april_tag_object_with_approval.xml @@ -1,36 +1,123 @@ - - + + - + - - - + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + + +