dijkstra402
9f8b5eaf71
Merge dev branch: Add battery resources, bioyond_cell device registry, and fix file path resolution
2025-12-18 11:11:59 +08:00
Xuwznln
16ee3de086
Add workflow upload func.
2025-12-08 19:12:05 +08:00
Xuwznln
6a681e1d73
Update docs
2025-11-18 18:43:29 +08:00
ZiWei
2c774bcd1d
feat(反应站): 添加反应器子设备支持
...
- 在设备注册表中添加反应器子设备配置
- 实现BioyondReactor类用于处理反应器数据
- 更新反应站主设备以支持子设备数据同步
- 在测试配置中添加5个反应器实例
2025-11-18 18:43:28 +08:00
ZiWei
850eeae55a
HR物料同步，前端展示位置修复 ( #135 )
...
* 更新Bioyond工作站配置，添加新的物料类型映射和载架定义，优化物料查询逻辑
* 添加Bioyond实验配置文件，定义物料类型映射和设备配置
* 更新bioyond_warehouse_reagent_stack方法，修正试剂堆栈尺寸和布局描述
* 更新Bioyond实验配置，修正物料类型映射，优化设备配置
* 更新Bioyond资源同步逻辑，优化物料入库流程，增强错误处理和日志记录
* 更新Bioyond资源，添加配液站和反应站专用载架，优化仓库工厂函数的排序方式
* 更新Bioyond资源，添加配液站和反应站相关载架，优化试剂瓶和样品瓶配置
* 更新Bioyond实验配置，修正试剂瓶载架ID，确保与设备匹配
* 更新Bioyond资源，移除反应站单烧杯载架，添加反应站单烧瓶载架分类
* Refactor Bioyond resource synchronization and update bottle carrier definitions
- Removed traceback printing in error handling for Bioyond synchronization.
- Enhanced logging for existing Bioyond material ID usage during synchronization.
- Added new bottle carrier definitions for single flask and updated existing ones.
- Refactored dispensing station and reaction station bottle definitions for clarity and consistency.
- Improved resource mapping and error handling in graphio for Bioyond resource conversion.
- Introduced layout parameter in warehouse factory for better warehouse configuration.
* 更新Bioyond仓库工厂，添加排序方式支持，优化坐标计算逻辑
* 更新Bioyond载架和甲板配置，调整样品板尺寸和仓库坐标
* 更新Bioyond资源同步，增强占用位置日志信息，修正坐标转换逻辑
* 更新Bioyond反应站和分配站配置，调整材料类型映射和ID，移除不必要的项
* support name change during materials change
* fix json dumps
* correct tip
* 优化调度器API路径，更新相关方法描述
* 更新 BIOYOND 载架相关文档，调整 API 以支持自带试剂瓶的载架类型，修复资源获取时的子物料处理逻辑
* 实现资源删除时的同步处理，优化出库操作逻辑
* 修复 ItemizedCarrier 中的可见性逻辑
* 保存 Bioyond 原始信息到 unilabos_extra，以便出库时查询
* 根据 resource.capacity 判断是试剂瓶（载架）还是多瓶载架，走不同的奔曜转换
* Fix bioyond bottle_carriers ordering
* 优化 Bioyond 物料同步逻辑，增强坐标解析和位置更新处理
* disable slave connect websocket
* correct remove_resource stats
* change uuid logger to trace level
* enable slave mode
* refactor(bioyond): 统一资源命名并优化物料同步逻辑
- 将DispensingStation和ReactionStation资源统一为PolymerStation命名
- 优化物料同步逻辑，支持耗材类型(typeMode=0)的查询
- 添加物料默认参数配置功能
- 调整仓库坐标布局
- 清理废弃资源定义
* feat(warehouses): 为仓库函数添加col_offset和layout参数
* refactor: 更新实验配置中的物料类型映射命名
将DispensingStation和ReactionStation的物料类型映射统一更名为PolymerStation，保持命名一致性
* fix: 更新实验配置中的载体名称从6VialCarrier到6StockCarrier
* feat(bioyond): 实现物料创建与入库分离逻辑
将物料同步流程拆分为两个独立阶段：transfer阶段只创建物料，add阶段执行入库
简化状态检查接口，仅返回连接状态
* fix(reaction_station): 修正液体进料烧杯体积单位并增强返回结果
将液体进料烧杯的体积单位从μL改为g以匹配实际使用场景
在返回结果中添加merged_workflow和order_params字段，提供更完整的工作流信息
* feat(dispensing_station): 在任务创建返回结果中添加order_params信息
在create_order方法返回结果中增加order_params字段，以便调用方获取完整的任务参数
* fix(dispensing_station): 修改90%物料分配逻辑从分成3份改为直接使用
原逻辑将主称固体平均分成3份作为90%物料，现改为直接使用main_portion
* feat(bioyond): 添加任务编码和任务ID的输出，支持批量任务创建后的状态监控
* refactor(registry): 简化设备配置中的任务结果处理逻辑
将多个单独的任务编码和ID字段合并为统一的return_info字段
更新相关描述以反映新的数据结构
* feat(工作站): 添加HTTP报送服务和任务完成状态跟踪
- 在graphio.py中添加API必需字段
- 实现工作站HTTP服务启动和停止逻辑
- 添加任务完成状态跟踪字典和等待方法
- 重写任务完成报送处理方法记录状态
- 支持批量任务完成等待和报告获取
* refactor(dispensing_station): 移除wait_for_order_completion_and_get_report功能
该功能已被wait_for_multiple_orders_and_get_reports替代，简化代码结构
* fix: 更新任务报告API错误
* fix(workstation_http_service): 修复状态查询中device_id获取逻辑
处理状态查询时安全获取device_id，避免因属性不存在导致的异常
* fix(bioyond_studio): 改进物料入库失败时的错误处理和日志记录
在物料入库API调用失败时，添加更详细的错误信息打印
同时修正station.py中对空响应和失败情况的判断逻辑
* refactor(bioyond): 优化瓶架载体的分配逻辑和注释说明
重构瓶架载体的分配逻辑，使用嵌套循环替代硬编码索引分配
添加更详细的坐标映射说明，明确PLR与Bioyond坐标的对应关系
* fix(bioyond_rpc): 修复物料入库成功时无data字段返回空的问题
当API返回成功但无data字段时，返回包含success标识的字典而非空字典
---------
Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com >
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-11-15 02:57:48 +08:00
tt
3bf8aad4d5
标准化opcua设备接入unilab ( #78 )
...
* 初始提交，只保留工作区当前状态
* remove redundant arm_slider meshes
---------
Co-authored-by: Junhan Chang <changjh@dp.tech >
2025-11-15 02:50:52 +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
dijkstra402
be429147c0
Fix infinite recursion in YB_jia_yang_tou_da by renaming carrier function to YB_jia_yang_tou_da_Carrier
2025-11-08 15:42:18 +08:00
Xuwznln
bed453034f
modify devices to use correct executor (sleep, create_task)
2025-11-08 12:13:44 +08:00
Xuwznln
0fda155f55
modify devices to use correct executor (sleep, create_task)
2025-11-03 15:49:11 +08:00
lixinyu1011
03745c5d08
byxinyu111
2025-11-01 10:37:45 +08:00
lixinyu1011
a62896eda2
1031_byxinyu
2025-10-31 18:57:38 +08:00
lixinyu1011
6d7c39da9e
1031
2025-10-31 15:29:59 +08:00
ZiWei
d0884cdbd8
bioyond_HR ( #133 )
...
* feat: Enhance Bioyond synchronization and resource management
- Implemented synchronization for all material types (consumables, samples, reagents) from Bioyond, logging detailed information for each type.
- Improved error handling and logging during synchronization processes.
- Added functionality to save Bioyond material IDs in UniLab resources for future updates.
- Enhanced the `sync_to_external` method to handle material movements correctly, including querying and creating materials in Bioyond.
- Updated warehouse configurations to support new storage types and improved layout for better resource management.
- Introduced new resource types such as reactors and tip boxes, with detailed specifications.
- Modified warehouse factory to support column offsets for naming conventions (e.g., A05-D08).
- Improved resource tracking by merging extra attributes instead of overwriting them.
- Added a new method for updating resources in Bioyond, ensuring better synchronization of resource changes.
* feat: 添加TipBox和Reactor的配置到bottles.yaml
* fix: 修复液体投料方法中的volume参数处理逻辑
2025-10-29 12:10:05 +08:00
calvincao
a97781c4eb
Merge remote-tracking branch 'origin/dev' into workstation_dev_YB3
2025-10-28 11:47:07 +08:00
lixinyu1011
3231d60646
1027by_Xinyu
2025-10-27 20:08:19 +08:00
lixinyu1011
d0279f63f0
Merge remote-tracking branch 'upstream/workstation_dev_YB3' into workstation_dev_YB3
2025-10-27 19:33:45 +08:00
lixinyu1011
ceef342860
1027byxinyu
2025-10-27 18:16:26 +08:00
dijkstra402
01adf7ca92
refactor: 将 BIOYOND_PolymerStation_ 前缀统一改为 YB_
...
- 重命名 bottles.py 中所有工厂函数：BIOYOND_PolymerStation_* -> YB_*
- 重命名 bottle_carriers.py 中所有载具工厂函数和导入
- 更新 registry YAML 文件中的 module 引用
- 更新 MATERIAL_TYPE_MAPPINGS 配置中的类型字符串
- 更新测试文件和样例 JSON 中的类型引用
- 添加 YB_* 别名条目到 registry 以支持双键访问
2025-10-24 13:49:48 +08:00
Xianwei Qi
12ba110569
修改prcxi连线
2025-10-22 14:00:38 +08:00
ZiWei
9bdd42f12f
refactor(workstation): 更新反应站参数描述并添加分液站配置文件
...
修正反应站方法参数描述，使其更准确清晰
添加bioyond_dispensing_station.yaml配置文件
2025-10-21 23:30:45 +08:00
Xianwei Qi
627140da03
prcxi样例图
2025-10-21 21:15:54 +08:00
Xianwei Qi
5ceedb0565
Create example_prcxi.json
2025-10-21 20:38:40 +08:00
Junhan Chang
8c77a20c43
add create_workflow script and test
2025-10-21 20:32:00 +08:00
Junhan Chang
bd51c74fab
fix converter in resource_tracker
2025-10-18 16:22:30 +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
Xuwznln
3757bd9c58
fix state loading for regular container
2025-10-16 14:04:03 +08:00
Xuwznln
dfc635189c
fix comprehensive_station.json
2025-10-16 13:52:07 +08:00
Xuwznln
d8f3ebac15
fix comprehensive_station.json
2025-10-16 13:46:59 +08:00
Xuwznln
55d22a7c29
Update regular container method
2025-10-16 13:33:28 +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
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
Junhan Chang
25d46dc9d5
pass the tests
2025-10-11 07:20:34 +08:00
Junhan Chang
88c4d1a9d1
modify bioyond/plr converter, bioyond resource registry, and tests
2025-10-11 04:59:59 +08:00
Xuwznln
a1783f489e
Merge remote-tracking branch 'origin/workstation_dev_YB2' into dev
...
# Conflicts:
# unilabos/devices/workstation/bioyond_studio/bioyond_rpc.py
# unilabos/devices/workstation/bioyond_studio/station.py
# unilabos/resources/graphio.py
2025-10-10 15:38:45 +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
Xuwznln
5610c28b67
更新物料接口
2025-10-10 07:13:59 +08:00
Junhan Chang
cfc1ee6e79
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 >
2025-09-30 17:23:13 +08:00
Junhan Chang
2476821dcc
update bioyond launch json
2025-09-30 12:25:21 +08:00
Junhan Chang
196e0f7e2b
fix bioyond station and registry
2025-09-26 08:12:41 +08:00
Junhan Chang
5c47cd0c8a
add BIOYOND deck assignment and pass all tests
2025-09-25 08:41:41 +08:00
Junhan Chang
63ab1af45d
refactor and add BIOYOND resources tests
2025-09-25 08:14:48 +08:00
Junhan Chang
a8419dc0c3
add standardized BIOYOND resources: bottle_carrier, bottle
2025-09-25 03:49:07 +08:00
Junhan Chang
34f05f2e25
refactor: rename "station_resource" to "deck"
2025-09-24 10:53:11 +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
