Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/april_tag_sim/objectives/move_to_and_detect_tag_-45.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<BehaviorTree ID="Move To and Detect Tag -45" _description="">
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
orientation_xyzw="0.92388;0;-0.382683;0"
position_xyz="0.5;0.0;0.6"
/>
<Action ID="ResetPoseStampedVector" vector="{pose_stamped_vector}" />
<Action
ID="AddPoseStampedToVector"
input="{stamped_pose}"
input="{pose_stamped}"
vector="{pose_stamped_vector}"
/>
<Control ID="Fallback">
Expand Down Expand Up @@ -83,20 +83,20 @@
pose="{detection_pose}"
/>
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
/>
<Action
ID="TransformPoseFrame"
input_pose="{stamped_pose}"
output_pose="{stamped_pose}"
input_pose="{pose_stamped}"
output_pose="{pose_stamped}"
target_frame_id="grasp_link"
/>
<Action
ID="CalculatePoseOffset"
destination_pose="{detection_pose}"
source_pose="{stamped_pose}"
source_pose="{pose_stamped}"
source_to_destination_pose="{pose_diff}"
/>
<Action ID="Script" code="dir_path := '45degree_runs/'" />
Expand Down
16 changes: 8 additions & 8 deletions src/april_tag_sim/objectives/move_to_and_detect_tag_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<BehaviorTree ID="Move To and Detect Tag 0" _description="">
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
orientation_xyzw="1;0;0;0"
position_xyz="0.;0.0;0.6"
/>
<Action ID="ResetPoseStampedVector" vector="{pose_stamped_vector}" />
<Action
ID="AddPoseStampedToVector"
input="{stamped_pose}"
input="{pose_stamped}"
vector="{pose_stamped_vector}"
/>
<Control ID="Fallback">
Expand Down Expand Up @@ -83,20 +83,20 @@
pose="{detection_pose}"
/>
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
/>
<Action
ID="TransformPoseFrame"
input_pose="{stamped_pose}"
output_pose="{stamped_pose}"
input_pose="{pose_stamped}"
output_pose="{pose_stamped}"
target_frame_id="grasp_link"
/>
<Action
ID="CalculatePoseOffset"
destination_pose="{detection_pose}"
source_pose="{stamped_pose}"
source_pose="{pose_stamped}"
source_to_destination_pose="{pose_diff}"
/>
<Action ID="Script" code="dir_path := '0degree_runs/'" />
Expand Down
16 changes: 8 additions & 8 deletions src/april_tag_sim/objectives/move_to_and_detect_tag_45.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<BehaviorTree ID="Move To and Detect Tag 45" _description="">
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
orientation_xyzw="0.92388;0;0.382683;0"
position_xyz="-0.6;0.0;0.6"
/>
<Action ID="ResetPoseStampedVector" vector="{pose_stamped_vector}" />
<Action
ID="AddPoseStampedToVector"
input="{stamped_pose}"
input="{pose_stamped}"
vector="{pose_stamped_vector}"
/>
<Control ID="Fallback">
Expand Down Expand Up @@ -83,20 +83,20 @@
pose="{detection_pose}"
/>
<Action
ID="CreateStampedPose"
stamped_pose="{stamped_pose}"
ID="CreatePoseStamped"
pose_stamped="{pose_stamped}"
reference_frame="{tag_name}"
/>
<Action
ID="TransformPoseFrame"
input_pose="{stamped_pose}"
output_pose="{stamped_pose}"
input_pose="{pose_stamped}"
output_pose="{pose_stamped}"
target_frame_id="grasp_link"
/>
<Action
ID="CalculatePoseOffset"
destination_pose="{detection_pose}"
source_pose="{stamped_pose}"
source_pose="{pose_stamped}"
source_to_destination_pose="{pose_diff}"
/>
<Action ID="Script" code="dir_path := '45degree_runs/'" />
Expand Down
2 changes: 1 addition & 1 deletion src/dual_arm_sim/objectives/draw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Metadata runnable="false" />
<Metadata subcategory="Motion - Execute" />
</MetadataFields>
<inout_port name="center" default="{stamped_pose}" />
<inout_port name="center" default="{pose_stamped}" />
<inout_port name="controller_name" default="{controller_names}" />
<inout_port
name="execute_follow_joint_trajectory_action_name"
Expand Down
12 changes: 6 additions & 6 deletions src/dual_arm_sim/objectives/writing_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
waypoint_name="Home"
/>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{stamped_pose}"
pose_stamped="{pose_stamped}"
orientation_xyzw="-0.7073883;0.7068252;0.0000327;0.0000328"
position_xyz="0.4;0.0;0.02"
name="Create center pose"
Expand All @@ -28,27 +28,27 @@
marker_lifetime="0.000000"
marker_name="pose"
marker_size="0.100000"
pose="{stamped_pose}"
pose="{pose_stamped}"
/>
<Decorator ID="Repeat" num_cycles="-1">
<Control ID="Sequence" name="TopLevelSequence">
<SubTree
ID="Draw and Wipe"
_collapsed="false"
file_path="moveit_pro.yaml"
center="{stamped_pose}"
center="{pose_stamped}"
/>
<SubTree
ID="Draw and Wipe"
_collapsed="true"
file_path="loves.yaml"
center="{stamped_pose}"
center="{pose_stamped}"
/>
<SubTree
ID="Draw and Wipe"
_collapsed="true"
file_path="franka.yaml"
center="{stamped_pose}"
center="{pose_stamped}"
/>
</Control>
</Decorator>
Expand Down
4 changes: 2 additions & 2 deletions src/factory_sim/objectives/add_bins_to_planning_scene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
>
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{world_frame}"
pose_stamped="{world_frame}"
name="world frame"
/>
<Action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<Control ID="Sequence" name="Move to the right bin to drop">
<!--The drop pose is at a 5 degree tilt so it doesn't drop straight into the bin or on top of another part. Simulator instabilities can cause parts to jump when dropped perfectly flat.-->
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{drop_pose}"
pose_stamped="{drop_pose}"
orientation_xyzw="-0.706; -0.706; -0.031; -0.031"
position_xyz="0.23;0.54;0.65"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
>
<!--The drop pose is just above two tapered posts representing a tooling jib that match alignment holes in the bracket part. The part is then released and settles onto those jig posts.-->
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="jig_post1"
stamped_pose="{drop_pose}"
pose_stamped="{drop_pose}"
orientation_xyzw="1.000; 0.000; 0.000; 0.000"
position_xyz="0.012;-0.01;0.16"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/factory_sim/objectives/indicate_jig_empty.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
>
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{signal_light_pose}"
pose_stamped="{signal_light_pose}"
position_xyz="-0.1;-1;0.2"
name="Locate bracket jig state indicator"
/>
Expand All @@ -21,10 +21,10 @@
name="Indicate there is no bracket in jig"
/>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
position_xyz="-0.1;-1;0.6"
stamped_pose="{jig_state_pose}"
pose_stamped="{jig_state_pose}"
/>
<Action
ID="VisualizePose"
Expand Down
8 changes: 4 additions & 4 deletions src/factory_sim/objectives/indicate_jig_working.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
>
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{signal_light_pose}"
pose_stamped="{signal_light_pose}"
position_xyz="-0.1;-1;0.2"
name="Locate bracket jig state indicator"
/>
Expand All @@ -21,10 +21,10 @@
name="Indicate there is no bracket in jig"
/>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
position_xyz="-0.1;-1;0.6"
stamped_pose="{jig_state_pose}"
pose_stamped="{jig_state_pose}"
/>
<Action
ID="VisualizePose"
Expand Down
8 changes: 4 additions & 4 deletions src/factory_sim/objectives/indicate_part_ready.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
>
<Control ID="Sequence">
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{signal_light_pose}"
pose_stamped="{signal_light_pose}"
position_xyz="-0.1;-1;0.2"
name="Locate bracket jig state indicator"
/>
Expand All @@ -21,10 +21,10 @@
name="Indicate there is no bracket in jig"
/>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
position_xyz="-0.1;-1;0.6"
stamped_pose="{jig_state_pose}"
pose_stamped="{jig_state_pose}"
/>
<Action
ID="VisualizePose"
Expand Down
8 changes: 4 additions & 4 deletions src/factory_sim/objectives/look_for_bracket_part_subtree.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
>
<!--Get the bracket pointcloud from the CAD file and make a guess as to where it might be-->
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
position_xyz="-0.35;0.8;0.4"
orientation_xyzw="0.000;0.000;0.0;1"
name="Initial guess for bracket pose, somewhere above left bin"
stamped_pose="{guess_pose}"
pose_stamped="{guess_pose}"
reference_frame="world"
/>
<SubTree
Expand Down Expand Up @@ -60,9 +60,9 @@
name="Crop out points belonging to the bin by making a box that approximates the bin internal volume"
>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{centroid_pose}"
pose_stamped="{centroid_pose}"
position_xyz="-0.25;0.6;0.4"
/>
<Action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
/>
<SubTree ID="Activate Vacuum" _collapsed="true" />
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{bracket_on_jig}"
pose_stamped="{bracket_on_jig}"
orientation_xyzw="0.000; 0.000; 1.000; 0.000"
position_xyz="-0.319; -0.483; 0.225"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/factory_sim/objectives/pick_brackets_from_left_bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
<!--Get the bracket pointcloud from the CAD file and make a guess as to where it might be-->
<Action ID="ClearSnapshot" />
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
position_xyz="-0.35;0.8;0.4"
orientation_xyzw="0.000;0.000;0.0;1"
name="Initial guess for bracket pose, somewhere above left bin"
stamped_pose="{guess_pose}"
pose_stamped="{guess_pose}"
reference_frame="world"
/>
<SubTree
Expand Down Expand Up @@ -87,9 +87,9 @@
name="Crop out points belonging to the bin by making a box that approximates the bin internal volume"
>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="world"
stamped_pose="{centroid_pose}"
pose_stamped="{centroid_pose}"
position_xyz="-0.25;0.6;0.4"
/>
<Action
Expand Down
4 changes: 2 additions & 2 deletions src/factory_sim/objectives/pick_up_tool_from_holder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
timeout="10"
/>
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="{tool_attach_site}"
position_xyz="0;0;-0.1"
stamped_pose="{approach_pose}"
pose_stamped="{approach_pose}"
/>
<Action
ID="InitializeMTCTask"
Expand Down
4 changes: 2 additions & 2 deletions src/factory_sim/objectives/place_tool_in_tool_holder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
>
<Control ID="Sequence" name="TopLevelSequence">
<Action
ID="CreateStampedPose"
ID="CreatePoseStamped"
reference_frame="{tool_return_site}"
position_xyz="0;0;-0.15"
stamped_pose="{approach_pose}"
pose_stamped="{approach_pose}"
/>
<Action
ID="InitializeMTCTask"
Expand Down
Loading
Loading