dijkstra402
e2097f0b22
添加新物料类型映射：包括100ml液体、液、高粘液、5ml/20ml分液瓶、配液瓶、加样头、适配器块、枪头盒等
2025-10-23 21:56:54 +08:00
calvincao
fd73731130
增强批量入库功能，添加物料数据同步逻辑；优化日志记录以提供更详细的同步状态信息。
2025-10-23 18:02:49 +08:00
calvincao
1af6ffafc6
新增批量创建固体物料和从CSV文件入库的功能；更新配置文件中的 report_ip 默认值；新增 solid_materials.csv 文件以支持物料名称导入。
2025-10-23 17:32:08 +08:00
calvincao
5a7845d8ca
更新配置文件中的 report_ip 默认值，优化 bioyond_cell_workstation.py 中的订单状态处理逻辑，新增多个瓶子和载架类型的定义，调整仓库结构以支持更灵活的物料管理。
2025-10-23 08:34:33 +08:00
calvincao
9c4d0256cf
增强配置文件，新增 report_ip 选项以支持本机 IP 地址的灵活配置；在 bioyond_cell_workstation.py 中优化推送地址更新逻辑，支持自动检测和配置优先级处理。
2025-10-22 16:38:32 +08:00
calvincao
de7c80c3c2
重构：完善配置加载机制与初始化逻辑
...
新增环境变量覆盖机制，增强配置灵活性
优化 bioyond_rpc.py 与 bioyond_cell_workstation.py 的初始化流程与结构
修正 station.py 工作流映射逻辑，确保正确性
提高代码可读性与模块间解耦程度
2025-10-22 16:13:36 +08:00
calvincao
e70c545ec8
修复 **bioyond_yihua_YB.json** 中的 JSON 合并冲突，清理不必要的标记。
2025-10-21 15:19:44 +08:00
calvincao
2c2d1e5569
在 **bioyond_cell_workstation.py** 中实现 update_push_ip 方法并增强错误处理；修复 **bioyond_yihua_YB.json** 中的 JSON 合并冲突。
2025-10-21 14:58:38 +08:00
lixinyu1011
37641c4389
xinyu1021推送代码
2025-10-21 14:48:55 +08:00
lixinyu1011
ab697ce973
Update station.py
2025-10-20 16:12:38 +08:00
lixinyu1011
2f25063bf1
Update bioyond_cell_workstation.py
2025-10-20 15:30:41 +08:00
lixinyu1011
d2352cc514
1020_YB奔耀仿真机同步对齐dev_unilab可控
...
待修改unilab的http服务
2025-10-20 12:48:19 +08:00
ZiWei
229888f834
Fix resource assignment and type mapping issues
...
Corrects resource assignment in ItemizedCarrier by using the correct spot key from _ordering. Updates graphio to use 'typeName' instead of 'name' for type mapping in resource_bioyond_to_plr. Renames DummyWorkstation to BioyondWorkstation in workstation_http_service for clarity.
2025-10-18 18:55:16 +08:00
ZiWei
ba81cbddf8
Merge branch 'dev' of https://github.com/dptech-corp/Uni-Lab-OS into dev
2025-10-18 10:51:04 +08:00
ZiWei
4e92a26057
fix(reaction_station): 清空工作流序列和参数避免重复执行 ( #113 )
...
在创建任务后清空工作流序列和参数，防止下次执行时累积重复
2025-10-17 13:41:50 +08:00
ZiWei
c2895bb197
fix(reaction_station): 清空工作流序列和参数避免重复累积
2025-10-17 13:13:54 +08:00
ZiWei
6972680099
Refactor Bioyond workstation and experiment workflow -fix ( #111 )
...
* refactor(bioyond_studio): 优化材料缓存加载和参数验证逻辑
改进材料缓存加载逻辑以支持多种材料类型和详细材料处理
更新工作流参数验证中的字段名从key/value改为Key/DisplayValue
移除未使用的merge_workflow_with_parameters方法
添加get_station_info方法获取工作站基础信息
清理实验文件中的注释代码和更新导入路径
* fix: 修复资源移除时的父资源检查问题
在BaseROS2DeviceNode中，移除资源前添加对父资源是否为None的检查，避免空指针异常
同时更新Bottle和BottleCarrier类以支持**kwargs参数
修正测试文件中Liquid_feeding_beaker的大小写拼写错误
2025-10-17 02:59:58 +08:00
ZiWei
f5753afb7c
refactor(bioyond_studio): 优化材料缓存加载和参数验证逻辑
...
改进材料缓存加载逻辑以支持多种材料类型和详细材料处理
更新工作流参数验证中的字段名从key/value改为Key/DisplayValue
移除未使用的merge_workflow_with_parameters方法
添加get_station_info方法获取工作站基础信息
清理实验文件中的注释代码和更新导入路径
2025-10-16 23:58:24 +08:00
ZiWei
4ddabdcb65
Refactor Bioyond workstation and experiment workflow ( #105 )
...
Refactored the Bioyond workstation classes to improve parameter handling and workflow management. Updated experiment.py to use BioyondReactionStation with deck and material mappings, and enhanced workflow step parameter mapping and execution logic. Adjusted JSON experiment configs, improved workflow sequence handling, and added UUID assignment to PLR materials. Removed unused station_config and material cache logic, and added detailed docstrings and debug output for workflow methods.
2025-10-14 02:46:31 +08:00
Xuwznln
70b2715996
Fix workstation resource not tracking
2025-10-14 00:05:41 +08:00
Xuwznln
aed39b648d
Fix workstation startup
...
Update registry
2025-10-13 15:01:46 +08:00
Junhan Chang
09f745d300
modify default config
2025-10-13 10:49:15 +08:00
Junhan Chang
bbcbcde9a4
add plr_to_bioyond, and refactor bioyond stations
2025-10-13 09:41:43 +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
c8d16c7024
update todo
2025-10-11 13:53:17 +08:00
Xuwznln
0c42d60cf2
更新transfer_resource_to_another参数，支持spot入参
2025-10-11 02:41:37 +08:00
Xuwznln
df33e1a214
修复transfer_resource_to_another生成
2025-10-11 01:12:56 +08:00
Xuwznln
609b6006e8
支持选择器注册表自动生成
...
支持转运物料
2025-10-11 00:57:22 +08:00
ZiWei
54cfaf15f3
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.
2025-10-10 15:25:50 +08:00
Junhan Chang
1c9d2ee98a
fix bioyond resource io
2025-09-30 17:02:38 +08:00
Junhan Chang
7b426ed5ae
create warehouse by factory func
2025-09-30 11:57:34 +08:00
Junhan Chang
196e0f7e2b
fix bioyond station and registry
2025-09-26 08:12:41 +08:00
Junhan Chang
a632fd495e
bioyond station with communication init and resource sync
2025-09-25 20:56:29 +08:00
Junhan Chang
a8cc02a126
add bioyond studio draft
2025-09-25 20:36:52 +08:00
Xie Qiming
ad2e1432c6
feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 ( #92 )
...
* feat: 新威电池测试系统驱动与注册文件
* feat: bring neware driver & battery.json into workstation_dev_YB2
2025-09-25 18:53:04 +08:00
Junhan Chang
34f05f2e25
refactor: rename "station_resource" to "deck"
2025-09-24 10:53:11 +08:00
h840473807
0dc2488f02
coin_cell_station draft
2025-09-23 01:18:04 +08:00
Xuwznln
301bea639e
修复protocolnode的兼容性
2025-09-19 22:54:27 +08:00
Xuwznln
4b5a83efa4
修复protocolnode的兼容性
2025-09-19 21:09:07 +08:00
Xuwznln
091c9fa247
Merge branch 'workstation_dev' into dev
...
# Conflicts:
# .conda/recipe.yaml
# recipes/msgs/recipe.yaml
# recipes/unilabos/recipe.yaml
# setup.py
# unilabos/registry/devices/work_station.yaml
# unilabos/ros/nodes/base_device_node.py
# unilabos/ros/nodes/presets/protocol_node.py
# unilabos_msgs/package.xml
2025-09-19 19:52:53 +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
Xie Qiming
ace98a4472
Feature/xprbalance-zhida ( #80 )
...
* feat(devices): add Zhida GC/MS pretreatment automation workstation
* feat(devices): add mettler_toledo xpr balance
* balance
2025-09-19 11:43:25 +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
Xuwznln
1cd07915e7
Correct runze pump multiple receive method.
2025-09-14 03:17:50 +08:00
Xuwznln
b600fc666d
Correct runze pump multiple receive method.
2025-09-14 03:07:48 +08:00
