diff --git a/robowaiter/scene/scene.py b/robowaiter/scene/scene.py index e0d18b2..b69c219 100644 --- a/robowaiter/scene/scene.py +++ b/robowaiter/scene/scene.py @@ -507,6 +507,9 @@ class Scene: obj_info = scene.objects[obj_id] obj_x, obj_y, obj_z = obj_info.location.X, obj_info.location.Y, obj_info.location.Z if obj_info.name=="CoffeeCup": + values = [0,0,0,0,0, -15,0,0,0,0] + # values= [-6, 0, 0, 0, 0, -6, 0, 45, 45, 45] + stub.Do(GrabSim_pb2.Action(scene=self.sceneID, action=GrabSim_pb2.Action.ActionType.Finger, values=values)) pass if obj_info.name=="Glass": pass @@ -526,6 +529,11 @@ class Scene: values=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]) scene = stub.Do(action) + def standard_finger(self): + values = [0,0,0,0,0, 0,0,0,0,0] + stub.Do(GrabSim_pb2.Action(scene=self.sceneID, action=GrabSim_pb2.Action.ActionType.Finger, values=values)) + time.sleep(1.0) + def robo_stoop_parallel(self): # 0-3是躯干,4-6是脖子和头,7-13是左胳膊,14-20是右胳膊 @@ -553,6 +561,7 @@ class Scene: scene = stub.Do(action) time.sleep(2.0) self.robo_recover() + self.standard_finger() return True @@ -700,11 +709,4 @@ class Scene: ginger_x, ginger_y, ginger_z = [int(scene.location.X), int(scene.location.Y),100] return math.sqrt((ginger_x - objx) ** 2 + (ginger_y - objy) ** 2 + (ginger_z - objz) ** 2) - # def test_yaw(self): - # walk_v = [247.0, 480.0, 180.0, 180, 0] - # action = GrabSim_pb2.Action(scene=self.sceneID, action=GrabSim_pb2.Action.ActionType.WalkTo, values=walk_v) - # scene = stub.Do(action) - # time.sleep(4) - # walk_v = [247.0, 500.0, 0.0, 180, 0] - # action = GrabSim_pb2.Action(scene=self.sceneID, action=GrabSim_pb2.Action.ActionType.WalkTo, values=walk_v) - # scene = stub.Do(action) \ No newline at end of file +