From cd12932788b57ebceb821f419cdbf54f321b166d Mon Sep 17 00:00:00 2001 From: lixinyu1011 <674842481@qq.com> Date: Mon, 3 Nov 2025 22:53:37 +0800 Subject: [PATCH] 1103byxinyu --- .../workstation/coin_cell_assembly/YB_YH_materials.py | 8 ++++---- .../workstation/coin_cell_assembly/coin_cell_assembly.py | 4 ++-- .../workstation/coin_cell_assembly/new_cellconfig3c.json | 5 +++-- unilabos/registry/devices/bioyond_cell.yaml | 1 + unilabos/resources/bioyond/decks.py | 1 - 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py b/unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py index 5c3aa870..a2dff68a 100644 --- a/unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py +++ b/unilabos/devices/workstation/coin_cell_assembly/YB_YH_materials.py @@ -986,10 +986,10 @@ class CoincellDeck(Deck): def __init__( self, name: str = "coin_cell_deck", - size_x: float = 1000.0, # 1m - size_y: float = 1000.0, # 1m - size_z: float = 900.0, # 0.9m - origin: Coordinate = Coordinate(0, 0, 0), + size_x: float = 3650.0, # 1m + size_y: float = 1550.0, # 1m + size_z: float = 2100.0, # 0.9m + origin: Coordinate = Coordinate(-4000, 2000, 0), category: str = "coin_cell_deck", setup: bool = False, # 是否自动执行 setup ): diff --git a/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py b/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py index d968e993..752b3d5f 100644 --- a/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py +++ b/unilabos/devices/workstation/coin_cell_assembly/coin_cell_assembly.py @@ -112,7 +112,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase): def __init__( self, deck: Deck=None, - address: str = "172.21.32.111", + address: str = "172.21.33.176", port: str = "502", debug_mode: bool = False, *args, @@ -138,7 +138,7 @@ class CoinCellAssemblyWorkstation(WorkstationBase): # 如果没有传入 deck,则创建标准配置的 deck if self.deck is None: - self.deck = CoincellDeck(size_x=1000, size_y=1000, size_z=900, setup=True) + self.deck = CoincellDeck(size_x=1000, size_y=1000, size_z=900, origin=Coordinate(-100, -100, 0),setup=True) else: # 如果传入了 deck 但还没有 setup,可以选择是否 setup if self.deck is not None and len(self.deck.children) == 0: diff --git a/unilabos/devices/workstation/coin_cell_assembly/new_cellconfig3c.json b/unilabos/devices/workstation/coin_cell_assembly/new_cellconfig3c.json index 36190858..14e6a22a 100644 --- a/unilabos/devices/workstation/coin_cell_assembly/new_cellconfig3c.json +++ b/unilabos/devices/workstation/coin_cell_assembly/new_cellconfig3c.json @@ -14,6 +14,7 @@ }, "data": {} }, + { "id": "BatteryStation", "name": "扣电工作站", @@ -24,8 +25,8 @@ "type": "device", "class": "coincellassemblyworkstation_device", "position": { - "x": 600, - "y": 400, + "x": -600, + "y": -400, "z": 0 }, "config": { diff --git a/unilabos/registry/devices/bioyond_cell.yaml b/unilabos/registry/devices/bioyond_cell.yaml index a9d754fc..c6ad6691 100644 --- a/unilabos/registry/devices/bioyond_cell.yaml +++ b/unilabos/registry/devices/bioyond_cell.yaml @@ -4,6 +4,7 @@ bioyond_cell: class: action_value_mappings: auto-auto_batch_outbound_from_xlsx: + display_name: 批量导入上料 feedback: {} goal: {} goal_default: diff --git a/unilabos/resources/bioyond/decks.py b/unilabos/resources/bioyond/decks.py index 5a089941..32642c3d 100644 --- a/unilabos/resources/bioyond/decks.py +++ b/unilabos/resources/bioyond/decks.py @@ -36,7 +36,6 @@ class BIOYOND_PolymerReactionStation_Deck(Deck): for warehouse_name, warehouse in self.warehouses.items(): self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name]) - class BIOYOND_PolymerPreparationStation_Deck(Deck): def __init__( self,