mirror of
https://github.com/deepmodeling/Uni-Lab-OS
synced 2026-04-25 19:04:39 +00:00
7505e024f3
- MagazineHolder: klasses=None，解耦极片子节点初始化 - Magazine: 重写 serialize/deserialize，截断旧极片脏数据 - bottle_carriers: 移除 YIHUA_Electrolyte_12VialCarrier 初始化填瓶 - decks.py: BIOYOND_YB_Deck→BioyondElectrolyteDeck，移除 setup 参数 - YB_YH_materials.py: CoincellDeck→YihuaCoinCellDeck，新增 electrolyte_buffer 槽位 - resource_tracker.py: Container 状态键预填 + 重复 UUID 自动修复 + 树级名称去重 - itemized_carrier.py: XY 近似坐标匹配，修复 Z 偏移问题 - bioyond_cell_workstation.py: 跨站转运改用真实资源 + 类型映射双模式查找 - station.py: sync_to_external 属性访问路径修复 - coin_cell_assembly.py: 新增 10 个 Modbus 余量属性 - CSV/JSON/YAML 配置同步更新（类名重命名 + 移除 setup） - 新增 changelog_2026-03-12.md
159 lines
7.3 KiB
Python
159 lines
7.3 KiB
Python
from pylabrobot.resources import Deck, Coordinate, Rotation
|
||
|
||
from unilabos.resources.bioyond.YB_warehouses import (
|
||
bioyond_warehouse_1x4x4,
|
||
bioyond_warehouse_1x4x4_right, # 新增：右侧仓库 (A05～D08)
|
||
bioyond_warehouse_1x4x2,
|
||
bioyond_warehouse_reagent_stack, # 新增：试剂堆栈 (A1-B4)
|
||
bioyond_warehouse_liquid_and_lid_handling,
|
||
bioyond_warehouse_1x2x2,
|
||
bioyond_warehouse_2x2x1, # 新增：321和43窗口 (2行×2列)
|
||
bioyond_warehouse_1x3x3,
|
||
bioyond_warehouse_5x3x1, # 新增：手动传递窗仓库 (5行×3列)
|
||
bioyond_warehouse_10x1x1,
|
||
bioyond_warehouse_3x3x1,
|
||
bioyond_warehouse_3x3x1_2,
|
||
bioyond_warehouse_5x1x1,
|
||
bioyond_warehouse_1x8x4,
|
||
bioyond_warehouse_reagent_storage,
|
||
# bioyond_warehouse_liquid_preparation,
|
||
bioyond_warehouse_density_vial,
|
||
)
|
||
from unilabos.resources.bioyond.warehouses import (
|
||
bioyond_warehouse_tipbox_storage_left, # 新增：Tip盒堆栈(左)
|
||
bioyond_warehouse_tipbox_storage_right, # 新增：Tip盒堆栈(右)
|
||
)
|
||
|
||
|
||
class BIOYOND_PolymerReactionStation_Deck(Deck):
|
||
def __init__(
|
||
self,
|
||
name: str = "PolymerReactionStation_Deck",
|
||
size_x: float = 2700.0,
|
||
size_y: float = 1080.0,
|
||
size_z: float = 1500.0,
|
||
category: str = "deck",
|
||
) -> None:
|
||
super().__init__(name=name, size_x=2700.0, size_y=1080.0, size_z=1500.0)
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库
|
||
# 说明: 堆栈1物理上分为左右两部分
|
||
# - 堆栈1左: A01～D04 (4行×4列, 位于反应站左侧)
|
||
# - 堆栈1右: A05～D08 (4行×4列, 位于反应站右侧)
|
||
self.warehouses = {
|
||
"堆栈1左": bioyond_warehouse_1x4x4("堆栈1左"), # 左侧堆栈: A01～D04
|
||
"堆栈1右": bioyond_warehouse_1x4x4_right("堆栈1右"), # 右侧堆栈: A05～D08
|
||
"站内试剂存放堆栈": bioyond_warehouse_reagent_storage("站内试剂存放堆栈"), # A01～A02
|
||
# "移液站内10%分装液体准备仓库": bioyond_warehouse_liquid_preparation("移液站内10%分装液体准备仓库"), # A01～B04
|
||
"站内Tip盒堆栈(左)": bioyond_warehouse_tipbox_storage_left("站内Tip盒堆栈(左)"), # A02～B03
|
||
"站内Tip盒堆栈(右)": bioyond_warehouse_tipbox_storage_right("站内Tip盒堆栈(右)"), # A01～B01
|
||
"测量小瓶仓库(测密度)": bioyond_warehouse_density_vial("测量小瓶仓库(测密度)"), # A01～B03
|
||
}
|
||
self.warehouse_locations = {
|
||
"堆栈1左": Coordinate(-200.0, 400.0, 0.0), # 左侧位置
|
||
"堆栈1右": Coordinate(2350.0, 400.0, 0.0), # 右侧位置
|
||
"站内试剂存放堆栈": Coordinate(640.0, 400.0, 0.0),
|
||
"站内Tip盒堆栈(左)": Coordinate(300.0, 100.0, 0.0),
|
||
"站内Tip盒堆栈(右)": Coordinate(2250.0, 100.0, 0.0), # 向右偏移 2 * item_dx (137.0)
|
||
"测量小瓶仓库(测密度)": Coordinate(1000.0, 530.0, 0.0),
|
||
}
|
||
|
||
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,
|
||
name: str = "PolymerPreparationStation_Deck",
|
||
size_x: float = 2700.0,
|
||
size_y: float = 1080.0,
|
||
size_z: float = 1500.0,
|
||
category: str = "deck",
|
||
) -> None:
|
||
super().__init__(name=name, size_x=2700.0, size_y=1080.0, size_z=1500.0)
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库 - 配液站的3个堆栈，使用Bioyond系统中的实际名称
|
||
# 样品类型（typeMode=1）：烧杯、试剂瓶、分装板 → 试剂堆栈、溶液堆栈
|
||
# 试剂类型（typeMode=2）：样品板 → 粉末堆栈
|
||
self.warehouses = {
|
||
# 试剂类型 - 样品板
|
||
"粉末堆栈": bioyond_warehouse_1x4x4("粉末堆栈"), # 4行×4列 (A01-D04)
|
||
|
||
# 样品类型 - 烧杯、试剂瓶、分装板
|
||
"试剂堆栈": bioyond_warehouse_reagent_stack("试剂堆栈"), # 2行×4列 (A01-B04)
|
||
"溶液堆栈": bioyond_warehouse_1x4x4("溶液堆栈"), # 4行×4列 (A01-D04)
|
||
}
|
||
self.warehouse_locations = {
|
||
"粉末堆栈": Coordinate(-200.0, 400.0, 0.0),
|
||
"试剂堆栈": Coordinate(1750.0, 160.0, 0.0),
|
||
"溶液堆栈": Coordinate(2350.0, 400.0, 0.0),
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
|
||
class BioyondElectrolyteDeck(Deck):
|
||
def __init__(
|
||
self,
|
||
name: str = "YB_Deck",
|
||
size_x: float = 4150,
|
||
size_y: float = 1400.0,
|
||
size_z: float = 2670.0,
|
||
category: str = "deck",
|
||
) -> None:
|
||
super().__init__(name=name, size_x=4150.0, size_y=1400.0, size_z=2670.0)
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库
|
||
self.warehouses = {
|
||
"自动堆栈-左": bioyond_warehouse_2x2x1("自动堆栈-左"), # 2行×2列
|
||
"自动堆栈-右": bioyond_warehouse_2x2x1("自动堆栈-右"), # 2行×2列
|
||
"手动传递窗右": bioyond_warehouse_5x3x1("手动传递窗右", row_offset=0), # A01-E03
|
||
"手动传递窗左": bioyond_warehouse_5x3x1("手动传递窗左", row_offset=5), # F01-J03
|
||
"加样头堆栈左": bioyond_warehouse_10x1x1("加样头堆栈左"),
|
||
"加样头堆栈右": bioyond_warehouse_10x1x1("加样头堆栈右"),
|
||
|
||
"15ml配液堆栈左": bioyond_warehouse_3x3x1("15ml配液堆栈左"),
|
||
"母液加样右": bioyond_warehouse_3x3x1_2("母液加样右"),
|
||
"大瓶母液堆栈左": bioyond_warehouse_5x1x1("大瓶母液堆栈左"),
|
||
"大瓶母液堆栈右": bioyond_warehouse_5x1x1("大瓶母液堆栈右"),
|
||
"2号手套箱内部堆栈": bioyond_warehouse_3x3x1("2号手套箱内部堆栈"), # 新增：3行×3列 (A01-C03)
|
||
}
|
||
# warehouse 的位置
|
||
self.warehouse_locations = {
|
||
"自动堆栈-左": Coordinate(-150.0, 1142.0, 0.0),
|
||
"自动堆栈-右": Coordinate(4160.0, 1142.0, 0.0),
|
||
"手动传递窗左": Coordinate(-150.0, 423.0, 0.0),
|
||
"手动传递窗右": Coordinate(4160.0, 423.0, 0.0),
|
||
"加样头堆栈左": Coordinate(385.0, 0, 0.0),
|
||
"加样头堆栈右": Coordinate(2187.0, 0, 0.0),
|
||
|
||
"15ml配液堆栈左": Coordinate(749.0, 945.0, 0.0),
|
||
"母液加样右": Coordinate(2152.0, 967.0, 0.0),
|
||
"大瓶母液堆栈左": Coordinate(1164.0, 624.0, 0.0),
|
||
"大瓶母液堆栈右": Coordinate(2717.0, 624.0, 0.0),
|
||
"2号手套箱内部堆栈": Coordinate(-800, 800.0, 0.0), # 新增：位置需根据实际硬件调整
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
|
||
# 向后兼容别名，日后废弃
|
||
BIOYOND_YB_Deck = BioyondElectrolyteDeck
|
||
|
||
|
||
def bioyond_electrolyte_deck(name: str) -> BioyondElectrolyteDeck:
|
||
deck = BioyondElectrolyteDeck(name=name)
|
||
deck.setup()
|
||
return deck
|
||
|
||
|
||
# 向后兼容别名，日后废弃
|
||
def YB_Deck(name: str) -> BioyondElectrolyteDeck:
|
||
return bioyond_electrolyte_deck(name)
|