zhangshixiang
18d0ba7a46
Revert "Merge branch 'dev' into prcix9320"
...
This reverts commit de7fbe7ac8
2026-01-12 16:01:07 +08:00
zhangshixiang
de7fbe7ac8
Merge branch 'dev' into prcix9320
2026-01-12 14:31:56 +08:00
zhangshixiang
31e8d065c4
Merge branch 'dev' into prcix9320
2026-01-08 11:45:54 +08:00
zhangshixiang
219a480c08
merge prcxi.py
2026-01-07 15:32:27 +08:00
Xianwei Qi
63eb0c0a4c
test_transfer_liquid_3
...
unilabos/test/experiments/prcxi_9320_with_res_test.json需要起的部分：
"debug": true,
"setup": false,
"simulator": true
2025-12-31 16:39:18 +08:00
q434343
888c6cf542
Merge remote-tracking branch 'origin/dev' into prcix9320
2025-12-30 16:20:05 +08:00
zhangshixiang
cc248fc32c
Update prcxi.py
2025-12-28 21:25:08 +08:00
zhangshixiang
cfe64b023b
添加抓取后物料上传
2025-12-28 01:44:34 +08:00
ALITTLELZ
a3c7fa9385
Enhance PRCXI9300 classes with new Container and TipRack implementations, improving state management and initialization logic. Update JSON configuration to reflect type changes for containers and plates.
2025-12-25 16:10:13 +08:00
q434343
3ddbc1c9b7
Merge branch 'prcix9320' into prcxi9320
2025-12-25 02:21:05 +08:00
zhangshixiang
abf1005241
云端可启动夹爪
2025-12-24 19:03:25 +08:00
zhangshixiang
c475eabb60
删除多余的laiyu部分
2025-12-23 19:09:00 +08:00
shuchang
acbaff7bb7
prcxi resource ( #202 )
...
* prcxi resource
* prcxi_resource
* Fix upload error not showing.
Support str type category.
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
2025-12-23 15:08:04 +08:00
zhangshixiang
3ad20c85a5
夹爪添加
2025-12-23 14:54:36 +08:00
zhangshixiang
44fc80c70f
添加切换枪头方法，添加mock振荡与加热方法
2025-12-16 11:19:13 +08:00
Xuwznln
ef14737839
update "laiyu" missing init file.
2025-12-14 13:08:27 +08:00
Xuwznln
5d5569121c
fix "laiyu" missing init file.
2025-12-14 12:55:25 +08:00
Xianwei Qi
6ac510dcd2
mix
...
修改了mix，仿真流程报错问题
2025-12-11 23:26:11 +08:00
zhangshixiang
896f287d92
对laiyu移液站进行部分修改，取消多次初始化的问题
2025-12-10 15:10:15 +08:00
zhangshixiang
cc56a68bc6
添加self.pending_liquids_dict的重置方法
2025-12-09 14:33:53 +08:00
zhangshixiang
d7302c3b35
返回dispense后的sample_uuid
2025-12-08 19:32:36 +08:00
zhangshixiang
b46a51c40e
添加 aspiate函数返回值
2025-12-08 16:55:38 +08:00
zhangshixiang
91aadba4ef
修改sample_uuid的返回值
2025-12-06 01:33:04 +08:00
Harry Liu
6fdd482649
Transfer_liquid ( #176 )
...
* change 9320 desk row number to 4
* Updated 9320 host address
* Updated 9320 host address
* Add **kwargs in classes: PRCXI9300Deck and PRCXI9300Container
* Removed all sample_id in prcxi_9320.json to avoid KeyError
* 9320 machine testing settings
* Typo
* Typo in base_device_node.py
* Enhance liquid handling functionality by adding support for multiple transfer modes (one-to-many, one-to-one, many-to-one) and improving parameter validation. Default channel usage is set when not specified. Adjusted mixing logic to ensure it only occurs when valid conditions are met. Updated documentation for clarity.
2025-11-27 13:49:04 +08:00
Harry Liu
9f4a69ddf5
Transfer_liquid ( #176 )
...
* change 9320 desk row number to 4
* Updated 9320 host address
* Updated 9320 host address
* Add **kwargs in classes: PRCXI9300Deck and PRCXI9300Container
* Removed all sample_id in prcxi_9320.json to avoid KeyError
* 9320 machine testing settings
* Typo
* Typo in base_device_node.py
* Enhance liquid handling functionality by adding support for multiple transfer modes (one-to-many, one-to-one, many-to-one) and improving parameter validation. Default channel usage is set when not specified. Adjusted mixing logic to ensure it only occurs when valid conditions are met. Updated documentation for clarity.
2025-11-26 19:30:42 +08:00
Xuwznln
653e6e1ac3
liquid_handler default use chatterbox instead of rviz backend
2025-11-18 18:43:28 +08:00
Xuwznln
75f09034ff
update docs, test examples
...
fix liquid_handler init bug
2025-11-18 18:42:27 +08:00
q434343
448e0074b7
3d sim ( #97 )
...
* 修改lh的json启动
* 修改lh的json启动
* 修改backend，做成sim的通用backend
* 修改yaml的地址，3D模型适配网页生产环境
* 添加laiyu硬件连接
* 修改移液枪的状态判断方法，
修改移液枪的状态判断方法，
添加三轴的表定点与零点之间的转换
添加三轴真实移动的backend
* 修改laiyu移液站
简化移动方法，
取消软件限制位置，
修改当值使用Z轴时也需要重新复位Z轴的问题
* 更新lh以及laiyu workshop
1,现在可以直接通过修改backend，适配其他的移液站，主类依旧使用LiquidHandler，不用重新编写
2,修改枪头判断标准，使用枪头自身判断而不是类的判断，
3,将归零参数用毫米计算，方便手动调整，
4,修改归零方式，上电使用机械归零，确定机械零点，手动归零设置工作区域零点方便计算，二者互不干涉
* 修改枪头动作
* 修改虚拟仿真方法
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-11-15 03:11:30 +08:00
Harry Liu
872b3d781f
PRCXI Reset Error Correction ( #166 )
...
* change 9320 desk row number to 4
* Updated 9320 host address
* Updated 9320 host address
* Add **kwargs in classes: PRCXI9300Deck and PRCXI9300Container
* Removed all sample_id in prcxi_9320.json to avoid KeyError
* 9320 machine testing settings
* Typo
* Rewrite setup logic to clear error code
* 初始化 step_mode 属性
2025-11-15 03:11:29 +08:00
q434343
a599eb70e5
3d sim ( #97 )
...
* 修改lh的json启动
* 修改lh的json启动
* 修改backend，做成sim的通用backend
* 修改yaml的地址，3D模型适配网页生产环境
* 添加laiyu硬件连接
* 修改移液枪的状态判断方法，
修改移液枪的状态判断方法，
添加三轴的表定点与零点之间的转换
添加三轴真实移动的backend
* 修改laiyu移液站
简化移动方法，
取消软件限制位置，
修改当值使用Z轴时也需要重新复位Z轴的问题
* 更新lh以及laiyu workshop
1,现在可以直接通过修改backend，适配其他的移液站，主类依旧使用LiquidHandler，不用重新编写
2,修改枪头判断标准，使用枪头自身判断而不是类的判断，
3,将归零参数用毫米计算，方便手动调整，
4,修改归零方式，上电使用机械归零，确定机械零点，手动归零设置工作区域零点方便计算，二者互不干涉
* 修改枪头动作
* 修改虚拟仿真方法
---------
Co-authored-by: zhangshixiang <@zhangshixiang>
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-11-15 02:50:17 +08:00
Harry Liu
c36f53791c
PRCXI Reset Error Correction ( #166 )
...
* change 9320 desk row number to 4
* Updated 9320 host address
* Updated 9320 host address
* Add **kwargs in classes: PRCXI9300Deck and PRCXI9300Container
* Removed all sample_id in prcxi_9320.json to avoid KeyError
* 9320 machine testing settings
* Typo
* Rewrite setup logic to clear error code
* 初始化 step_mode 属性
2025-11-15 02:48:46 +08:00
Xuwznln
813400f2b4
bump version to 0.10.9
...
update registry
2025-11-15 02:45:30 +08:00
Xuwznln
b6dfe2b944
Resource update & asyncio fix
...
correct bioyond config
prcxi example
fix append_resource
fix regularcontainer
fix cancel error
fix resource_get param
fix json dumps
support name change during materials change
enable slave mode
change uuid logger to trace level
correct remove_resource stats
disable slave connect websocket
adjust with_children param
modify devices to use correct executor (sleep, create_task)
support sleep and create_task in node
fix run async execution error
2025-11-15 02:45:12 +08:00
Xuwznln
eb4d2d96c5
bump version to 0.10.9
2025-11-15 02:28:59 +08:00
Xuwznln
0c55147ee4
prcxi example
2025-11-13 17:30:21 +08:00
Xuwznln
a5bad6074f
change uuid logger to trace level
2025-11-07 21:15:05 +08:00
Xuwznln
0fda155f55
modify devices to use correct executor (sleep, create_task)
2025-11-03 15:49:11 +08:00
Xuwznln
6e3eacd2f0
support sleep and create_task in node
2025-11-03 15:42:12 +08:00
Xuwznln
9aeffebde1
0.10.7 Update ( #101 )
...
* Cleanup registry to be easy-understanding (#76 )
* delete deprecated mock devices
* rename categories
* combine chromatographic devices
* rename rviz simulation nodes
* organic virtual devices
* parse vessel_id
* run registry completion before merge
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
* fix: workstation handlers and vessel_id parsing
* fix: working dir error when input config path
feat: report publish topic when error
* modify default discovery_interval to 15s
* feat: add trace log level
* feat: 添加ChinWe设备控制类，支持串口通信和电机控制功能 (#79 )
* fix: drop_tips not using auto resource select
* fix: discard_tips error
* fix: discard_tips
* fix: prcxi_res
* add: prcxi res
fix: startup slow
* feat: workstation example
* fix pumps and liquid_handler handle
* feat: 优化protocol node节点运行日志
* fix all protocol_compilers and remove deprecated devices
* feat: 新增use_remote_resource参数
* fix and remove redundant info
* bugfixes on organic protocols
* fix filter protocol
* fix protocol node
* 临时兼容错误的driver写法
* fix: prcxi import error
* use call_async in all service to avoid deadlock
* fix: figure_resource
* Update recipe.yaml
* add workstation template and battery example
* feat: add sk & ak
* update workstation base
* Create workstation_architecture.md
* refactor: workstation_base 重构为仅含业务逻辑，通信和子设备管理交给 ProtocolNode
* refactor: ProtocolNode→WorkstationNode
* Add:msgs.action (#83 )
* update: Workstation dev 将版本号从 0.10.3 更新为 0.10.4 (#84 )
* Add:msgs.action
* update: 将版本号从 0.10.3 更新为 0.10.4
* simplify resource system
* uncompleted refactor
* example for use WorkstationBase
* feat: websocket
* feat: websocket test
* feat: workstation example
* feat: action status
* fix: station自己的方法注册错误
* fix: 还原protocol node处理方法
* fix: build
* fix: missing job_id key
* ws test version 1
* ws test version 2
* ws protocol
* 增加物料关系上传日志
* 增加物料关系上传日志
* 修正物料关系上传
* 修复工站的tracker实例追踪失效问题
* 增加handle检测，增加material edge关系上传
* 修复event loop错误
* 修复edge上报错误
* 修复async错误
* 更新schema的title字段
* 主机节点信息等支持自动刷新
* 注册表编辑器
* 修复status密集发送时，消息出错
* 增加addr参数
* fix: addr param
* fix: addr param
* 取消labid 和 强制config输入
* Add action definitions for LiquidHandlerSetGroup and LiquidHandlerTransferGroup
- Created LiquidHandlerSetGroup.action with fields for group name, wells, and volumes.
- Created LiquidHandlerTransferGroup.action with fields for source and target group names and unit volume.
- Both actions include response fields for return information and success status.
* Add LiquidHandlerSetGroup and LiquidHandlerTransferGroup actions to CMakeLists
* Add set_group and transfer_group methods to PRCXI9300Handler and update liquid_handler.yaml
* result_info改为字典类型
* 新增uat的地址替换
* runze multiple pump support
(cherry picked from commit 49354fcf398bcc92a3944771ff2347#86 )
* fix run_column
* Update run_column_protocol.py
(cherry picked from commit e5aa4d940a#80 )
* feat(devices): add Zhida GC/MS pretreatment automation workstation
* feat(devices): add mettler_toledo xpr balance
* balance
* 重新补全zhida注册表
* PRCXI9320 json
* PRCXI9320 json
* PRCXI9320 json
* fix resource download
* remove class for resource
* bump version to 0.10.6
* 更新所有注册表
* 修复protocolnode的兼容性
* 修复protocolnode的兼容性
* Update install md
* Add Defaultlayout
* 更新物料接口
* fix dict to tree/nested-dict converter
* coin_cell_station draft
* refactor: rename "station_resource" to "deck"
* add standardized BIOYOND resources: bottle_carrier, bottle
* refactor and add BIOYOND resources tests
* add BIOYOND deck assignment and pass all tests
* fix: update resource with correct structure; remove deprecated liquid_handler set_group action
* feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92 )
* feat: 新威电池测试系统驱动与注册文件
* feat: bring neware driver & battery.json into workstation_dev_YB2
* add bioyond studio draft
* bioyond station with communication init and resource sync
* fix bioyond station and registry
* fix: update resource with correct structure; remove deprecated liquid_handler set_group action
* frontend_docs
* create/update resources with POST/PUT for big amount/ small amount data
* create/update resources with POST/PUT for big amount/ small amount data
* refactor: add itemized_carrier instead of carrier consists of ResourceHolder
* create warehouse by factory func
* update bioyond launch json
* add child_size for itemized_carrier
* fix bioyond resource io
* Workstation templates: Resources and its CRUD, and workstation tasks (#95 )
* coin_cell_station draft
* refactor: rename "station_resource" to "deck"
* add standardized BIOYOND resources: bottle_carrier, bottle
* refactor and add BIOYOND resources tests
* add BIOYOND deck assignment and pass all tests
* fix: update resource with correct structure; remove deprecated liquid_handler set_group action
* feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92 )
* feat: 新威电池测试系统驱动与注册文件
* feat: bring neware driver & battery.json into workstation_dev_YB2
* add bioyond studio draft
* bioyond station with communication init and resource sync
* fix bioyond station and registry
* create/update resources with POST/PUT for big amount/ small amount data
* refactor: add itemized_carrier instead of carrier consists of ResourceHolder
* create warehouse by factory func
* update bioyond launch json
* add child_size for itemized_carrier
* fix bioyond resource io
---------
Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com >
Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com >
* 更新物料接口
* Workstation dev yb2 (#100 )
* Refactor and extend reaction station action messages
* Refactor dispensing station tasks to enhance parameter clarity and add batch processing capabilities
- Updated `create_90_10_vial_feeding_task` to include detailed parameters for 90%/10% vial feeding, improving clarity and usability.
- Introduced `create_batch_90_10_vial_feeding_task` for batch processing of 90%/10% vial feeding tasks with JSON formatted input.
- Added `create_batch_diamine_solution_task` for batch preparation of diamine solution, also utilizing JSON formatted input.
- Refined `create_diamine_solution_task` to include additional parameters for better task configuration.
- Enhanced schema descriptions and default values for improved user guidance.
* 修复to_plr_resources
* add update remove
* 支持选择器注册表自动生成
支持转运物料
* 修复资源添加
* 修复transfer_resource_to_another生成
* 更新transfer_resource_to_another参数，支持spot入参
* 新增test_resource动作
* fix host_node error
* fix host_node test_resource error
* fix host_node test_resource error
* 过滤本地动作
* 移动内部action以兼容host node
* 修复同步任务报错不显示的bug
* feat: 允许返回非本节点物料，后面可以通过decoration进行区分，就不进行warning了
* update todo
* modify bioyond/plr converter, bioyond resource registry, and tests
* pass the tests
* update todo
* add conda-pack-build.yml
* add auto install script for conda-pack-build.yml
(cherry picked from commit 172599adcf#99 )
* Add LaiYu Liquid device integration and tests
Introduce LaiYu Liquid device implementation, including backend, controllers, drivers, configuration, and resource files. Add hardware connection, tip pickup, and simplified test scripts, as well as experiment and registry configuration for LaiYu Liquid. Documentation and .gitignore for the device are also included.
* feat(LaiYu_Liquid): 重构设备模块结构并添加硬件文档
refactor: 重新组织LaiYu_Liquid模块目录结构
docs: 添加SOPA移液器和步进电机控制指令文档
fix: 修正设备配置中的最大体积默认值
test: 新增工作台配置测试用例
chore: 删除过时的测试脚本和配置文件
* add
* 重构: 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py 并更新所有导入引用
- 使用 git mv 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py
- 更新所有相关文件中的导入引用
- 保持代码功能不变，仅改善命名一致性
- 测试确认所有导入正常工作
* 修复: 在 core/__init__.py 中添加 LaiYuLiquidBackend 导出
- 添加 LaiYuLiquidBackend 到导入列表
- 添加 LaiYuLiquidBackend 到 __all__ 导出列表
- 确保所有主要类都可以正确导入
* 修复大小写文件夹名字
* 电池装配工站二次开发教程（带目录）上传至dev (#94 )
* 电池装配工站二次开发教程
* Update intro.md
* 物料教程
* 更新物料教程，json格式注释
* Update prcxi driver & fix transfer_liquid mix_times (#90 )
* Update prcxi driver & fix transfer_liquid mix_times
* fix: correct mix_times type
* Update liquid_handler registry
* test: prcxi.py
* Update registry from pr
* fix ony-key script not exist
* clean files
---------
Co-authored-by: Junhan Chang <changjh@dp.tech >
Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com >
Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com >
Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com >
Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com >
Co-authored-by: LccLink <1951855008@qq.com >
Co-authored-by: lixinyu1011 <61094742+lixinyu1011@users.noreply.github.com >
Co-authored-by: shiyubo0410 <shiyubo@dp.tech >
2025-10-12 23:34:26 +08:00
shiyubo0410
2d4ecec1e1
Update prcxi driver & fix transfer_liquid mix_times ( #90 )
...
* Update prcxi driver & fix transfer_liquid mix_times
* fix: correct mix_times type
* Update liquid_handler registry
* test: prcxi.py
2025-10-12 22:56:39 +08:00
ZiWei
b263a7e679
Workshop bj ( #99 )
...
* Add LaiYu Liquid device integration and tests
Introduce LaiYu Liquid device implementation, including backend, controllers, drivers, configuration, and resource files. Add hardware connection, tip pickup, and simplified test scripts, as well as experiment and registry configuration for LaiYu Liquid. Documentation and .gitignore for the device are also included.
* feat(LaiYu_Liquid): 重构设备模块结构并添加硬件文档
refactor: 重新组织LaiYu_Liquid模块目录结构
docs: 添加SOPA移液器和步进电机控制指令文档
fix: 修正设备配置中的最大体积默认值
test: 新增工作台配置测试用例
chore: 删除过时的测试脚本和配置文件
* add
* 重构: 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py 并更新所有导入引用
- 使用 git mv 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py
- 更新所有相关文件中的导入引用
- 保持代码功能不变，仅改善命名一致性
- 测试确认所有导入正常工作
* 修复: 在 core/__init__.py 中添加 LaiYuLiquidBackend 导出
- 添加 LaiYuLiquidBackend 到导入列表
- 添加 LaiYuLiquidBackend 到 __all__ 导出列表
- 确保所有主要类都可以正确导入
* 修复大小写文件夹名字
2025-10-12 22:54:38 +08:00
Xuwznln
62f3a6d696
PRCXI9320 json
2025-09-19 17:14:43 +08:00
Xuwznln
eb70ad0e18
PRCXI9320 json
2025-09-19 16:52:12 +08:00
Xuwznln
768f43880e
PRCXI9320 json
2025-09-19 16:29:18 +08:00
Guangxin Zhang
e5006285df
重新规定了版位推荐的入参
2025-09-18 15:27:22 +01:00
Guangxin Zhang
573c724a5c
新增版位推荐功能
2025-09-17 21:07:19 +01:00
Guangxin Zhang
94cdcbf24e
对于PRCXI9320的transfer_group，一对多和多对多
2025-09-15 00:29:16 +08:00
Junhan Chang
0bfb52df00
Squash merge from dev
...
Update recipe.yaml
fix: figure_resource
use call_async in all service to avoid deadlock
fix: prcxi import error
临时兼容错误的driver写法
fix protocol node
fix filter protocol
bugfixes on organic protocols
fix and remove redundant info
feat: 新增use_remote_resource参数
fix all protocol_compilers and remove deprecated devices
feat: 优化protocol node节点运行日志
fix pumps and liquid_handler handle
feat: workstation example
add: prcxi res
fix: startup slow
fix: prcxi_res
fix: discard_tips
fix: discard_tips error
fix: drop_tips not using auto resource select
feat: 添加ChinWe设备控制类，支持串口通信和电机控制功能 (#79 )
feat: add trace log level
modify default discovery_interval to 15s
fix: working dir error when input config path
feat: report publish topic when error
fix: workstation handlers and vessel_id parsing
Cleanup registry to be easy-understanding (#76 )
* delete deprecated mock devices
* rename categories
* combine chromatographic devices
* rename rviz simulation nodes
* organic virtual devices
* parse vessel_id
* run registry completion before merge
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
2025-09-10 21:41:50 +08:00
Guangxin Zhang
58d1cc4720
Add set_group and transfer_group methods to PRCXI9300Handler and update liquid_handler.yaml
2025-09-10 21:23:15 +08:00
Guangxin Zhang
1ae274a833
Add action definitions for LiquidHandlerSetGroup and LiquidHandlerTransferGroup
...
- Created LiquidHandlerSetGroup.action with fields for group name, wells, and volumes.
- Created LiquidHandlerTransferGroup.action with fields for source and target group names and unit volume.
- Both actions include response fields for return information and success status.
2025-09-10 20:57:16 +08:00
