Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Update Objectives that use IsForceWithinThreshold #107

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Update Objectives that use IsForceWithinThreshold #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06df98d
Update Objectives that use IsForceWithinThreshold
sea-bass Sep 25, 2023
c5ffa25
Remove extra tags
sea-bass Sep 25, 2023
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
13 changes: 6 additions & 7 deletions src/picknik_ur_site_config/objectives/close_cabinet_door.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
<Action ID="SplitMTCSolution" solution_in="{full_close_cabinet_door_solution}" index="3" solution_out_1="{move_to_approach_solution}" solution_out_2="{push_solution}" />
<Action ID="WaitForUserTrajectoryApproval" solution="{full_close_cabinet_door_solution}"/>
<Action ID="ExecuteMTCTask" solution="{move_to_approach_solution}"/>

<Action ID="SaveCurrentState" saved_robot_state="{pre_approach_robot_state}" />
<ForceSuccess>
<ReactiveSequence>
<Condition ID="IsForceWithinThreshold" parameters="{parameters}" />
<Action ID="ExecuteMTCTask" solution="{push_solution}" />
</ReactiveSequence>
</ForceSuccess>
<Control ID="Parallel" success_count="1" failure_count="1">
<Decorator ID="Inverter">
<Condition ID="IsForceWithinThreshold" parameters="{parameters}"/>
</Decorator>
<Action ID="ExecuteMTCTask" solution="{push_solution}"/>
</Control>
</Control>
<SubTree ID="RetreatToInitialPose" pre_approach_robot_state="{pre_approach_robot_state}" initial_robot_state="{initial_robot_state}" parameters="{parameters}" />
</Control>
Expand Down
13 changes: 6 additions & 7 deletions src/picknik_ur_site_config/objectives/push_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
<Action ID="SplitMTCSolution" solution_in="{full_push_button_solution}" index="3" solution_out_1="{move_to_approach_solution}" solution_out_2="{push_solution}" />
<Action ID="WaitForUserTrajectoryApproval" solution="{full_push_button_solution}"/>
<Action ID="ExecuteMTCTask" solution="{move_to_approach_solution}"/>

<Action ID="SaveCurrentState" saved_robot_state="{pre_approach_robot_state}" />
<ForceSuccess>
<ReactiveSequence>
<Condition ID="IsForceWithinThreshold" parameters="{parameters}" />
<Action ID="ExecuteMTCTask" solution="{push_solution}" />
</ReactiveSequence>
</ForceSuccess>
<Control ID="Parallel" success_count="1" failure_count="1">
<Decorator ID="Inverter">
<Condition ID="IsForceWithinThreshold" parameters="{parameters}"/>
</Decorator>
<Action ID="ExecuteMTCTask" solution="{push_solution}"/>
</Control>
</Control>
<SubTree ID="RetreatToInitialPose" pre_approach_robot_state="{pre_approach_robot_state}" initial_robot_state="{initial_robot_state}" parameters="{parameters}" />
</Control>
Expand Down
13 changes: 6 additions & 7 deletions src/picknik_ur_site_config/objectives/push_button_ml.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@
<Action ID="WaitForUserTrajectoryApproval"
solution="{full_push_along_axis_solution}" />
<Action ID="ExecuteMTCTask" solution="{move_to_approach_solution}" />

<Action ID="SaveCurrentState" saved_robot_state="{pre_approach_robot_state}" />
<ForceSuccess>
<ReactiveSequence>
<Condition ID="IsForceWithinThreshold" parameters="{parameters}" />
<Action ID="ExecuteMTCTask" solution="{push_solution}" />
</ReactiveSequence>
</ForceSuccess>
<Control ID="Parallel" success_count="1" failure_count="1">
<Decorator ID="Inverter">
<Condition ID="IsForceWithinThreshold" parameters="{parameters}"/>
</Decorator>
<Action ID="ExecuteMTCTask" solution="{push_solution}"/>
</Control>
</Control>
<SubTree ID="RetreatToInitialPose"
pre_approach_robot_state="{pre_approach_robot_state}"
Expand Down