Skip to content

Commit 8c17a90

Browse files
committed
Added outcome to cleanup
1 parent 66232e5 commit 8c17a90

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

challenge_cleanup/src/challenge_cleanup/self_cleanup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ def __init__(self, robot, selected_entity_designator, room_des):
275275

276276
smach.StateMachine.add("GRAB",
277277
Grab(robot, selected_entity_designator, arm_designator),
278-
transitions={"done": "SAY_GRAB_SUCCESS", "failed": "ARM_RESET"})
278+
transitions={"done": "SAY_GRAB_SUCCESS",
279+
"failed": "ARM_RESET",
280+
"object_not_grasped": "ARM_RESET"})
279281

280282
smach.StateMachine.add("ARM_RESET", ArmToJointConfig(robot, arm_designator, "reset"),
281283
transitions={"succeeded": "SAY_GRAB_FAILED", "failed": "SAY_GRAB_FAILED"})

challenge_storing_groceries/src/challenge_storing_groceries/manipulate_machine.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class DefaultGrabDesignator(ds.Designator):
2121
""" Designator to pick the closest item on top of the table to grab. This is used for testing
2222
2323
"""
24+
2425
def __init__(self, robot, surface_designator, area_description):
2526
""" Constructor
2627
@@ -119,7 +120,6 @@ def lock(userdata=None):
119120
'failed': 'UNLOCK_ITEM_FAIL',
120121
'object_not_grasped': 'UNLOCK_ITEM_FAIL'})
121122

122-
123123
@smach.cb_interface(outcomes=["unlocked"])
124124
def lock(userdata=None):
125125
""" 'Locks' a locking designator """
@@ -140,6 +140,7 @@ def lock(userdata=None):
140140
class PlaceSingleItem(smach.State):
141141
""" Tries to place an object. A 'place' statemachine is constructed dynamically since this makes it easier to
142142
build a statemachine (have we succeeded in grasping the objects?)"""
143+
143144
def __init__(self, robot, place_designator):
144145
""" Constructor
145146

0 commit comments

Comments
 (0)