diff --git a/demos/pycram_bullet_world_demo/demo.py b/demos/pycram_bullet_world_demo/demo.py index c19ad349c..6886af5da 100644 --- a/demos/pycram_bullet_world_demo/demo.py +++ b/demos/pycram_bullet_world_demo/demo.py @@ -67,11 +67,7 @@ def move_and_detect(obj_type): pickup_arm = "left" if drawer_open_loc.arms[0] == "right" else "right" PickUpAction(spoon_desig, [pickup_arm], ["top"]).resolve().perform() - ParkArmsAction([Arms.BOTH]).resolve().perform() - - close_loc = drawer_open_loc.pose - close_loc.position.y += 0.1 - NavigateAction([close_loc]).resolve().perform() + ParkArmsAction([Arms.LEFT if pickup_arm == "left" else Arms.RIGHT]).resolve().perform() CloseAction(object_designator_description=handle_desig, arms=[drawer_open_loc.arms[0]]).resolve().perform() diff --git a/src/pycram/process_modules/pr2_process_modules.py b/src/pycram/process_modules/pr2_process_modules.py index e49427485..75846131e 100644 --- a/src/pycram/process_modules/pr2_process_modules.py +++ b/src/pycram/process_modules/pr2_process_modules.py @@ -176,7 +176,7 @@ def _execute(self, desig: OpeningMotion): desig.object_part.bullet_world_object.set_joint_state(container_joint, part_of_object.get_joint_limits( - container_joint)[1]) + container_joint)[1] - 0.05) class Pr2Close(ProcessModule):