Skip to content

Commit 5579a14

Browse files
author
Bilal Gill
committed
resolve conflict
2 parents 9a1cfd0 + 8ada8e6 commit 5579a14

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/hangar_sim/objectives/count_boxes_subtree.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
negative_prompts="grey"
4444
threshold="0.5"
4545
/>
46-
<!--CropPointsInSphere here, perhaps-->
4746
<Action
4847
ID="PublishMask2D"
4948
image="{wrist_camera_image}"
@@ -65,6 +64,13 @@
6564
timeout_sec="5.000000"
6665
topic_name="/wrist_camera/points"
6766
/>
67+
<Action
68+
ID="CreateStampedPose"
69+
reference_frame="ridgeback_base_link"
70+
stamped_pose="{robot_pose}"
71+
orientation_xyzw="0;0;0;1"
72+
position_xyz="0;0;0"
73+
/>
6874
<Action
6975
ID="FindMaskedObjects"
7076
base_frame="world"

0 commit comments

Comments
 (0)