From 01c111db42b03cf13b2bb49c0d7011896a5e21e7 Mon Sep 17 00:00:00 2001 From: Netceor <45135347+Netceor@users.noreply.github.com> Date: Tue, 14 Nov 2023 14:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=B9=E5=B8=83=E6=A1=8C?= =?UTF-8?q?=E7=9A=84=E7=89=A9=E5=93=81=E6=8A=93=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- robowaiter/scene/tasks/VLM.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/robowaiter/scene/tasks/VLM.py b/robowaiter/scene/tasks/VLM.py index a7acf23..fec3af5 100644 --- a/robowaiter/scene/tasks/VLM.py +++ b/robowaiter/scene/tasks/VLM.py @@ -30,11 +30,12 @@ class SceneVLM(Scene): # 16: 抓操作需要传入物品id,17: 放操作需要传入放置位置周围的空地区域(桌边而不是桌上) # if op_type == 16: # self.gen_obj() - # self.op_task_execute(op_type, obj_id=0) + # self.op_task_execute(op_type, obj_id=1) + # op_type = 17 # # 原始吧台处:[247.0, 520.0, 100.0], 空调开关旁吧台:[240.0, 40.0, 70.0], 水杯桌:[-70.0, 500.0, 107] - # # 桌子1:[-55.0, 0.0, 107],桌子2:[-55.0, 150.0, 107] - # elif op_type == 17: self.op_task_execute(op_type, release_pos=[247.0, 520.0, 100.0])#[-55.0, 150.0, 107] - # else: + # # 桌子1:[-55.0, 0.0, 107],桌子2:[-55.0, 150.0, 107], 抹布桌:[300.0, 935.0, 98.0] + # if op_type == 17: self.op_task_execute(op_type, release_pos=[300.0, 935.0, 98.0]) #[325.0, 860.0, 100] + # if op_type not in [16,17]: # self.move_task_area(op_type) # self.op_task_execute(op_type) pass