From 34dd65d280bc16c4b3a2aefab98593fb3655cbdd Mon Sep 17 00:00:00 2001 From: Xuwznln <18435084+Xuwznln@users.noreply.github.com> Date: Sat, 19 Jul 2025 13:22:06 +0800 Subject: [PATCH 1/3] bump version to 0.10.0 --- README.md | 2 +- README_zh.md | 2 +- recipes/ros-humble-unilabos-msgs/recipe.yaml | 2 +- recipes/unilabos/recipe.yaml | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 011db12..f58cf3e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n environment_name # Currently, you need to install the `unilabos_msgs` package # You can download the system-specific package from the Release page -conda install ros-humble-unilabos-msgs-0.9.14-xxxxx.tar.bz2 +conda install ros-humble-unilabos-msgs-0.10.0-xxxxx.tar.bz2 # Install PyLabRobot and other prerequisites git clone https://github.com/PyLabRobot/pylabrobot plr_repo diff --git a/README_zh.md b/README_zh.md index 91e9b8d..ef555e7 100644 --- a/README_zh.md +++ b/README_zh.md @@ -49,7 +49,7 @@ conda env update --file unilabos-[YOUR_OS].yml -n 环境名 # 现阶段，需要安装 `unilabos_msgs` 包 # 可以前往 Release 页面下载系统对应的包进行安装 -conda install ros-humble-unilabos-msgs-0.9.14-xxxxx.tar.bz2 +conda install ros-humble-unilabos-msgs-0.10.0-xxxxx.tar.bz2 # 安装PyLabRobot等前置 git clone https://github.com/PyLabRobot/pylabrobot plr_repo diff --git a/recipes/ros-humble-unilabos-msgs/recipe.yaml b/recipes/ros-humble-unilabos-msgs/recipe.yaml index 9f4d631..81c390b 100644 --- a/recipes/ros-humble-unilabos-msgs/recipe.yaml +++ b/recipes/ros-humble-unilabos-msgs/recipe.yaml @@ -1,6 +1,6 @@ package: name: ros-humble-unilabos-msgs - version: 0.9.14 + version: 0.10.0 source: path: ../../unilabos_msgs folder: ros-humble-unilabos-msgs/src/work diff --git a/recipes/unilabos/recipe.yaml b/recipes/unilabos/recipe.yaml index 1a1b400..3b97b9a 100644 --- a/recipes/unilabos/recipe.yaml +++ b/recipes/unilabos/recipe.yaml @@ -1,6 +1,6 @@ package: name: unilabos - version: "0.9.14" + version: "0.10.0" source: path: ../.. diff --git a/setup.py b/setup.py index 97e21ef..f256bd6 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ package_name = 'unilabos' setup( name=package_name, - version='0.9.14', + version='0.10.0', packages=find_packages(), include_package_data=True, install_requires=['setuptools'], From 1467b9ac919aef5be50b3a45679b701aa92d719a Mon Sep 17 00:00:00 2001 From: Xuwznln <18435084+Xuwznln@users.noreply.github.com> Date: Sat, 19 Jul 2025 14:04:58 +0800 Subject: [PATCH 2/3] default param simulator --- unilabos/devices/liquid_handling/liquid_handler_abstract.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unilabos/devices/liquid_handling/liquid_handler_abstract.py b/unilabos/devices/liquid_handling/liquid_handler_abstract.py index d44a9ae..699c367 100644 --- a/unilabos/devices/liquid_handling/liquid_handler_abstract.py +++ b/unilabos/devices/liquid_handling/liquid_handler_abstract.py @@ -535,7 +535,7 @@ class LiquidHandlerAbstract(LiquidHandlerMiddleware): """Extended LiquidHandler with additional operations.""" support_touch_tip = True - def __init__(self, backend: LiquidHandlerBackend, deck: Deck, simulator: bool, channel_num:int = 8): + def __init__(self, backend: LiquidHandlerBackend, deck: Deck, simulator: bool=False, channel_num:int = 8): """Initialize a LiquidHandler. Args: From 98e9d0958339f516e1c9d8ee8bc17cc7325bb9cc Mon Sep 17 00:00:00 2001 From: Xuwznln <18435084+Xuwznln@users.noreply.github.com> Date: Sat, 19 Jul 2025 15:01:00 +0800 Subject: [PATCH 3/3] slim --- .../comprehensive_slim.json | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 test/experiments/comprehensive_protocol/comprehensive_slim.json diff --git a/test/experiments/comprehensive_protocol/comprehensive_slim.json b/test/experiments/comprehensive_protocol/comprehensive_slim.json new file mode 100644 index 0000000..d9dd773 --- /dev/null +++ b/test/experiments/comprehensive_protocol/comprehensive_slim.json @@ -0,0 +1,70 @@ +{ + "nodes": [ + { + "id": "OrganicSynthesisStation", + "name": "有机化学流程综合测试工作站", + "children": [ + "heater_1" + ], + "parent": null, + "type": "device", + "class": "workstation", + "position": { + "x": 600, + "y": 400, + "z": 0 + }, + "config": { + "protocol_type": [ + "AddProtocol", + "TransferProtocol", + "StartStirProtocol", + "StopStirProtocol", + "StirProtocol", + "RunColumnProtocol", + "CentrifugeProtocol", + "FilterProtocol", + "CleanVesselProtocol", + "DissolveProtocol", + "FilterThroughProtocol", + "WashSolidProtocol", + "SeparateProtocol", + "EvaporateProtocol", + "HeatChillProtocol", + "HeatChillStartProtocol", + "HeatChillStopProtocol", + "EvacuateAndRefillProtocol", + "PumpTransferProtocol", + "AdjustPHProtocol", + "ResetHandlingProtocol", + "DryProtocol", + "HydrogenateProtocol", + "RecrystallizeProtocol" + ] + }, + "data": {} + }, + { + "id": "heater_1", + "name": "加热器", + "children": [], + "parent": "OrganicSynthesisStation", + "type": "device", + "class": "virtual_heatchill", + "position": { + "x": 450, + "y": 450, + "z": 0 + }, + "config": { + "max_temp": 200.0, + "min_temp": -20.0 + }, + "data": { + "status": "Idle", + "current_temp": 25.0 + } + } + ], + "links": [] +} \ No newline at end of file