Skip to content

Commit 0dc4a75

Browse files
mariopratsshaur-k
authored andcommitted
clean up stationary admittance demo
1 parent 1439d13 commit 0dc4a75

File tree

5 files changed

+12
-134
lines changed

5 files changed

+12
-134
lines changed

src/lab_sim/objectives/admittance.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/lab_sim/objectives/admittance_stationary.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/lab_sim/objectives/re-zero_force-torque_sensors.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/lab_sim/objectives/admittance_demo.xml renamed to src/lab_sim/objectives/stationary_admittance.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<root BTCPP_format="4" main_tree_to_execute="Admittance Demo">
2+
<root BTCPP_format="4" main_tree_to_execute="Stationary Admittance">
33
<!--//////////-->
44
<BehaviorTree
5-
ID="Admittance Demo"
6-
_description="Reconfoobling the admitt-o-matron."
5+
ID="Stationary Admittance"
6+
_description="Puts the arm into Cartesian admittance mode"
77
_favorite="false"
88
>
99
<Control ID="Sequence" name="TopLevelSequence">
1010
<SubTree
1111
ID="Move to Waypoint"
1212
_collapsed="true"
13-
controller_names="/joint_trajectory_controller"
13+
controller_names="joint_trajectory_controller"
1414
planner_interface="moveit_default"
1515
waypoint_name="Home"
1616
acceleration_scale_factor="1.0"
@@ -42,7 +42,7 @@
4242
</Decorator>
4343
<Action
4444
ID="SetAdmittanceParameters"
45-
config_file_name="confooble.yaml"
45+
config_file_name="stationary_admittance.yaml"
4646
admittance_parameters_msg="{admittance_parameters_msg}"
4747
/>
4848
<Action
@@ -59,7 +59,12 @@
5959
ID="CreateStationaryTrajectory"
6060
joint_state="{joint_state}"
6161
joint_trajectory_msg="{joint_trajectory_msg}"
62-
trajectory_duration="-1.0"
62+
trajectory_duration="10"
63+
/>
64+
<Action
65+
ID="LogMessage"
66+
log_level="info"
67+
message="Running admittance mode for 10 seconds"
6368
/>
6469
<Action
6570
ID="ExecuteTrajectoryWithAdmittance"
@@ -74,7 +79,7 @@
7479
</Control>
7580
</BehaviorTree>
7681
<TreeNodesModel>
77-
<SubTree ID="Admittance Demo">
82+
<SubTree ID="Stationary Admittance">
7883
<MetadataFields>
7984
<Metadata runnable="true" />
8085
<Metadata subcategory="Application - Advanced Examples" />
File renamed without changes.

0 commit comments

Comments
 (0)