diff --git a/unilabos/registry/devices/liquid_handler.yaml b/unilabos/registry/devices/liquid_handler.yaml index 2bf975de..bcddae55 100644 --- a/unilabos/registry/devices/liquid_handler.yaml +++ b/unilabos/registry/devices/liquid_handler.yaml @@ -72,7 +72,7 @@ liquid_handler: feedback: { } result: { } mix: - type: DPLiquidHandlerMix + type: LiquidHandlerMix goal: targets: targets mix_time: mix_time @@ -255,24 +255,6 @@ liquid_handler: - name additionalProperties: false -dp_liquid_handler: - description: 通用液体处理 - class: - module: unilabos.devices.liquid_handling.action_definition:DPLiquidHandler - type: python - status_types: - status: String - action_value_mappings: - - schema: - type: object - properties: - name: - type: string - description: 物料名 - required: - - name - liquid_handler.revvity: class: module: unilabos.devices.liquid_handling.revvity:Revvity diff --git a/unilabos/ros/nodes/base_device_node.py b/unilabos/ros/nodes/base_device_node.py index 078cb470..335fee85 100644 --- a/unilabos/ros/nodes/base_device_node.py +++ b/unilabos/ros/nodes/base_device_node.py @@ -748,7 +748,7 @@ class ROS2DeviceNode: self.resource_tracker = DeviceNodeResourceTracker() # use_pylabrobot_creator 使用 cls的包路径检测 - use_pylabrobot_creator = driver_class.__module__.startswith("pylabrobot") or driver_class.__name__ == "DPLiquidHandler" + use_pylabrobot_creator = driver_class.__module__.startswith("pylabrobot") or driver_class.__name__ == "LiquidHandlerAbstract" # TODO: 要在创建之前预先请求服务器是否有当前id的物料,放到resource_tracker中,让pylabrobot进行创建 # 创建设备类实例