Skip to content

Commit 8f3fb36

Browse files
committed
End of 9/5 snack push
1 parent 347be4f commit 8f3fb36

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

ada_feeding/config/ada_feeding_action_servers_custom.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ ada_feeding_action_servers:
1010
- -1.617327609992979
1111
- 0.6628209810624257
1212
MoveAbovePlate.tree_kwargs.joint_positions:
13-
- -1.7699565678587286
14-
- 3.7596148709012875
15-
- 1.6383170478083295
16-
- -2.693377848439495
17-
- -1.2328692808133417
18-
- 7.957433724415264
13+
- -1.7328340996338412
14+
- 3.736167069083685
15+
- 1.584764074080144
16+
- -2.8533653867132425
17+
- -1.1693061503378208
18+
- 8.030768126088342
1919
MoveFromMouth.tree_kwargs.linear_speed_near_mouth: 0.08
2020
MoveFromMouth.tree_kwargs.max_linear_speed_to_staging_configuration: 0.15
2121
MoveFromMouth.tree_kwargs.staging_configuration_position:
22-
- -0.22162120639069535
23-
- -0.35776899361246467
24-
- 0.31226426005095975
22+
- -0.47929521732544705
23+
- -0.26231768456047105
24+
- 0.1742878774263848
2525
MoveFromMouth.tree_kwargs.staging_configuration_quat_xyzw:
26-
- 0.4113854220321883
27-
- -0.5506965295805886
28-
- -0.61615652377103
29-
- 0.38450813393437333
26+
- 0.184862034899018
27+
- -0.7378718130938825
28+
- -0.5805804120742961
29+
- 0.2903404908210032
3030
MoveToMouth.tree_kwargs.linear_speed_near_mouth: 0.06
3131
MoveToMouth.tree_kwargs.max_linear_speed: 0.14
3232
MoveToMouth.tree_kwargs.plan_distance_from_mouth:
33-
- 0.025
33+
- 0.03
3434
- 0.0
3535
- -0.01
3636
MoveToRestingPosition.tree_kwargs.goal_configuration:
@@ -41,17 +41,17 @@ ada_feeding_action_servers:
4141
- -1.617327609992979
4242
- 0.6628209810624257
4343
MoveToStagingConfiguration.tree_kwargs.goal_configuration:
44-
- -1.905103471064761
45-
- 4.043667100136921
46-
- 1.7112971158983705
47-
- -0.6656051162450218
48-
- 3.2963638582364023
49-
- 8.464224225109637
44+
- -1.183331421902614
45+
- 4.2885399686797445
46+
- 2.1657695506620276
47+
- -1.104379348226125
48+
- -2.363773314022492
49+
- 1.5785932635183215
5050
planning_scene_namespace_to_use: bedside_90
5151
custom_namespaces:
5252
- bed_side_table_1
5353
- wheelchair_side_table_1
54-
namespace_to_use: wheelchair_side_table_1
54+
namespace_to_use: bed_side_table_1
5555
wheelchair_side_table_1:
5656
AcquireFood.tree_kwargs.resting_joint_positions:
5757
- -0.8280291806000825

ada_planning_scene/config/ada_planning_scene.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ada_planning_scene:
2525
- bedside
2626
- seated_90
2727
- bedside_90
28-
namespace_to_use: seated_90 # bedside_90 #
28+
namespace_to_use: bedside_90 # seated_90 #
2929

3030
############################################################################
3131
# Parameters related to the PlanningSceneInitializer class

start.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
)
6565
parser.add_argument(
6666
"--policy",
67-
default="constant",
67+
default="linucb_noposthoc",
6868
help=(
6969
"`constant`, `color`, `random`, `random_noposthoc`, `greedy`, `greedy_noposthoc`, "
7070
"`egreedy`, `egreedy_noposthoc`, `linucb`, or `linucb_noposthoc` (default `constant`). "
@@ -291,7 +291,7 @@ async def main(args: argparse.Namespace, pwd: str) -> None:
291291
"sudo ./src/ada_feeding/configure_lovelace.sh",
292292
(
293293
"ros2 launch ada_feeding ada_feeding_launch.xml "
294-
f"use_estop:={'false' if args.dev else 'true'} run_web_bridge:=false policy:={args.policy} action:=1"
294+
f"use_estop:={'false' if args.dev else 'true'} run_web_bridge:=false policy:={args.policy} action:=0"
295295
),
296296
],
297297
"browser": [

0 commit comments

Comments
 (0)