Skip to content

Commit 6cb9600

Browse files
committed
small fixes
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
1 parent 113363b commit 6cb9600

File tree

4 files changed

+65
-325
lines changed

4 files changed

+65
-325
lines changed

src/hangar_sim/config/config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ros2_control:
9393
controllers_active_at_startup:
9494
- "force_torque_sensor_broadcaster"
9595
- "joint_state_broadcaster"
96-
- "servo_controller"
97-
- "platform_velocity_controller_nav2"
96+
- "joint_trajectory_controller"
97+
- "platform_velocity_controller"
9898
- "vacuum_gripper"
9999
# Load but do not start these controllers so they can be activated later if needed.
100100
controllers_inactive_at_startup:
101-
- "joint_trajectory_controller"
102-
- "platform_velocity_controller"
101+
- "servo_controller"
102+
- "platform_velocity_controller_nav2"
+9-45
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,25 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<root BTCPP_format="4" main_tree_to_execute="Bring It">
33
<!--//////////-->
4-
<BehaviorTree
5-
ID="Bring It"
6-
_description="Bring beer to table"
7-
_favorite="true"
8-
>
4+
<BehaviorTree ID="Bring It" _description="Bring beer to table" _favorite="true">
95
<Control ID="Sequence">
10-
<Action
11-
ID="CreateStampedPose"
12-
reference_frame="world"
13-
stamped_pose="{place_pose}"
14-
orientation_xyzw="0;1.0;0;0"
15-
position_xyz="-4.5;8.4;0.5"
16-
/>
6+
<Action ID="CreateStampedPose" reference_frame="world" stamped_pose="{place_pose}" orientation_xyzw="0;1.0;0;0" position_xyz="-4.5;8.4;0.5"/>
177
<Decorator ID="RetryUntilSuccessful" num_attempts="1000">
188
<Decorator ID="ForceFailure">
199
<Control ID="Sequence">
2010
<Control ID="Fallback">
21-
<SubTree
22-
ID="Bring It start from waypoint"
23-
waypoint_name="View Boxes"
24-
_collapsed="true"
25-
threshold="0.25"
26-
prompt="a small brown box"
27-
negative_prompts="yellow ladder;"
28-
prompts="small boxes"
29-
place_pose="{place_pose}"
30-
erosion_size="10"
31-
/>
32-
<SubTree
33-
ID="Bring It start from waypoint"
34-
waypoint_name="View Boxes 2"
35-
place_pose="{place_pose}"
36-
threshold="0.4"
37-
_collapsed="true"
38-
prompts="small boxes"
39-
negative_prompts="gray;gray;rails"
40-
erosion_size="2"
41-
/>
11+
<SubTree ID="Bring It start from waypoint" waypoint_name="View Boxes" _collapsed="true" threshold="0.25" prompt="a small brown box" negative_prompts="yellow ladder;" prompts="small boxes" place_pose="{place_pose}" erosion_size="10"/>
12+
<SubTree ID="Bring It start from waypoint" waypoint_name="View Boxes 2" place_pose="{place_pose}" threshold="0.4" _collapsed="true" prompts="small boxes" negative_prompts="gray;gray;rails" erosion_size="2"/>
4213
</Control>
43-
<Action
44-
ID="TransformPose"
45-
input_pose="{place_pose}"
46-
output_pose="{place_pose}"
47-
translation_xyz="0.4;0;0"
48-
/>
14+
<Action ID="TransformPose" input_pose="{place_pose}" output_pose="{place_pose}" translation_xyz="0.4;0;0"/>
4915
</Control>
5016
</Decorator>
5117
</Decorator>
5218
</Control>
5319
</BehaviorTree>
5420
<TreeNodesModel>
55-
<SubTree ID="Bring It">
56-
<MetadataFields>
57-
<Metadata runnable="true" />
58-
</MetadataFields>
59-
</SubTree>
21+
<SubTree ID="Bring It"><MetadataFields>
22+
<Metadata runnable="true"/>
23+
</MetadataFields></SubTree>
6024
</TreeNodesModel>
6125
</root>

0 commit comments

Comments
 (0)