Merge pull request #147 from lixinyu1011/workstation_dev_YB3

1104_byxinyu

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
     ):

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(-800, 0, 0),setup=True)
         else:
             # 如果传入了 deck 但还没有 setup，可以选择是否 setup
             if self.deck is not None and len(self.deck.children) == 0:

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": {

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:

unilabos/registry/devices/coin_cell_workstation.yaml

@@ -502,7 +502,7 @@ coincellassemblyworkstation_device:
   config_info: []
   description: ''
   handles: []
-  icon: ''
+  icon: coin_cell_assembly_picture.webp
   init_param_schema:
     config:
       properties:

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, 
@@ -90,9 +89,11 @@ class BIOYOND_YB_Deck(Deck):
             "自动堆栈-右": bioyond_warehouse_2x2x1("自动堆栈-右"),
             "手动堆栈-左": bioyond_warehouse_3x5x1("手动堆栈-左"),
             "手动堆栈-右": bioyond_warehouse_3x5x1("手动堆栈-右"),
-            "粉末加样头堆栈": bioyond_warehouse_20x1x1("粉末加样头堆栈"),
+            "粉末加样头堆栈-左": bioyond_warehouse_10x1x1("粉末加样头堆栈-左"),
+            "粉末加样头堆栈-右": bioyond_warehouse_10x1x1("粉末加样头堆栈-右"),
             "配液站内试剂仓库": bioyond_warehouse_3x3x1("配液站内试剂仓库"),
-            "试剂替换仓库": bioyond_warehouse_10x1x1("试剂替换仓库"),
+            "试剂替换仓库-左": bioyond_warehouse_5x1x1("试剂替换仓库-左"),
+            "试剂替换仓库-右": bioyond_warehouse_5x1x1("试剂替换仓库-右"),
         }
         # warehouse 的位置
         self.warehouse_locations = {
@@ -100,9 +101,11 @@ class BIOYOND_YB_Deck(Deck):
             "自动堆栈-右": Coordinate(4160.0, 158.0, 0.0),
             "手动堆栈-左": Coordinate(-400.0, 877.0, 0.0),
             "手动堆栈-右": Coordinate(4160.0, 877.0, 0.0),
-            "粉末加样头堆栈": Coordinate(385.0, 1300.0, 0.0),
-            "配液站内试剂仓库": Coordinate(1164.0, 676.0, 0.0),
-            "试剂替换仓库": Coordinate(2717.0, 676.0, 0.0),
+            "粉末加样头堆栈-左": Coordinate(415.0, 1301.0, 0.0),
+            "粉末加样头堆栈-右": Coordinate(2200.0, 1304.0, 0.0),
+            "配液站内试剂仓库": Coordinate(2162.0, 337.0, 0.0),
+            "试剂替换仓库-左": Coordinate(1173.0, 702.0, 0.0),
+            "试剂替换仓库-右": Coordinate(2721.0, 739.0, 0.0),
         }
 
         for warehouse_name, warehouse in self.warehouses.items():