ZiWei
64f02ff129
添加物料转移到反应站的功能，支持多组转移任务的配置与执行
2025-11-15 17:49:59 +08:00
ZiWei
7d097b8222
添加从报告中提取实际加料量的功能，支持液体进料滴定的自动公式计算
2025-11-15 13:30:22 +08:00
Xuwznln
31ebff8e37
Update devices
2025-11-15 03:10:05 +08:00
WenzheG
2132895ba2
nmr
2025-11-15 03:02:23 +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
xyc
d869c14233
add new laiyu liquid driver, yaml and json files ( #164 )
2025-11-15 02:52:19 +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
Xuwznln
8233c41b1d
update registry
2025-11-15 02:27:44 +08:00
WenzheG
7953b3820e
添加Raman和xrd相关代码
2025-11-15 02:23:09 +08:00
ZiWei
b9ddee8f2c
更新液体投料方法，支持通过溶剂信息自动计算体积，添加solvents参数并更新文档描述
2025-10-28 00:12:33 +08:00
ZiWei
a0c5095304
Add batch creation methods for vial and solution tasks
...
添加批量创建90%10%小瓶投料任务和二胺溶液配置任务的功能，更新相关参数和默认值
2025-10-27 23:55:32 +08:00
ZiWei
97212be8b7
Refine descriptions in Bioyond reaction station YAML
...
Updated and clarified field and operation descriptions in the reaction_station_bioyond.yaml file for improved accuracy and consistency. Changes include more precise terminology, clearer parameter explanations, and standardized formatting for operation schemas.
2025-10-21 23:32:41 +08:00
ZiWei
9bdd42f12f
refactor(workstation): 更新反应站参数描述并添加分液站配置文件
...
修正反应站方法参数描述，使其更准确清晰
添加bioyond_dispensing_station.yaml配置文件
2025-10-21 23:30:45 +08:00
ZiWei
57da2d8da2
refactor(registry): 重构反应站设备配置，简化并更新操作命令
...
移除旧的自动操作命令，新增针对具体化学操作的命令配置
更新模块路径和配置结构，优化参数定义和描述
2025-10-21 14:52:27 +08:00
Xuwznln
aed39b648d
Fix workstation startup
...
Update registry
2025-10-13 15:01:46 +08:00
Junhan Chang
bbcbcde9a4
add plr_to_bioyond, and refactor bioyond stations
2025-10-13 09:41:43 +08:00
Xuwznln
0fe62d64f0
Update registry from pr
2025-10-12 23:04:25 +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
9fa3688196
Update registry. Update uuid loop figure method. Update install docs.
2025-10-12 22:38:04 +08:00
Xuwznln
40fb1ea49c
Merge branch 'main' into dev
...
# Conflicts:
# .conda/recipe.yaml
# .github/workflows/conda-pack-build.yml
# recipes/msgs/recipe.yaml
# recipes/unilabos/recipe.yaml
# scripts/verify_installation.py
# setup.py
# unilabos/app/main.py
# unilabos/app/mq.py
# unilabos/app/register.py
# unilabos/compile/heatchill_protocol.py
# unilabos/compile/separate_protocol.py
# unilabos/config/config.py
# unilabos/devices/pump_and_valve/runze_backbone.py
# unilabos/devices/pump_and_valve/runze_multiple_backbone.py
# unilabos/registry/devices/characterization_chromatic.yaml
# unilabos/registry/devices/liquid_handler.yaml
# unilabos/registry/devices/pump_and_valve.yaml
# unilabos/registry/devices/robot_arm.yaml
# unilabos/registry/devices/robot_linear_motion.yaml
# unilabos/registry/devices/work_station.yaml
# unilabos/registry/registry.py
# unilabos/registry/resources/organic/workstation.yaml
# unilabos/resources/plr_additional_res_reg.py
# unilabos/ros/nodes/base_device_node.py
# unilabos/ros/nodes/presets/host_node.py
# unilabos/ros/nodes/presets/workstation.py
# unilabos/ros/nodes/resource_tracker.py
# unilabos/utils/environment_check.py
# unilabos_msgs/package.xml
2025-10-12 22:13:49 +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
196e0f7e2b
fix bioyond station and registry
2025-09-26 08:12:41 +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
c3b9583eac
fix: update resource with correct structure; remove deprecated liquid_handler set_group action
2025-09-25 15:27:05 +08:00
Junhan Chang
34f05f2e25
refactor: rename "station_resource" to "deck"
2025-09-24 10:53:11 +08:00
Xuwznln
4b5a83efa4
修复protocolnode的兼容性
2025-09-19 21:09:07 +08:00
Xuwznln
2889e9be2c
更新所有注册表
2025-09-19 20:28:43 +08:00
Xuwznln
762c3c737c
重新补全zhida注册表
2025-09-19 11:45:57 +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
Xuwznln
41eaa88c6f
修复移液站错误的aspirate注册表
2025-09-19 07:05:09 +08:00
Xuwznln
01f8816597
update registry with nested obj
2025-09-19 03:44:18 +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
Xuwznln
a555c59dc2
更新schema的title字段
2025-09-07 11:02:21 +08:00
Xuwznln
961752fb0d
更新schema的title字段
2025-09-07 00:43:23 +08:00
Xuwznln
02c79363c1
feat: add sk & ak
2025-08-20 21:23:08 +08:00
Junhan Chang
ea60cbe891
bugfixes on organic protocols
2025-08-12 14:50:01 +08:00
Junhan Chang
eac9b8ab3d
fix and remove redundant info
2025-08-11 20:52:03 +08:00
Junhan Chang
50e93cb1af
fix all protocol_compilers and remove deprecated devices
2025-08-11 15:01:04 +08:00
Junhan Chang
662c063f50
fix pumps and liquid_handler handle
2025-08-07 20:59:57 +08:00
Xuwznln
01cbbba0b3
feat: workstation example
2025-08-07 15:26:17 +08:00
Xuwznln
0605f305ed
fix: prcxi_res
2025-08-06 23:06:22 +08:00
Xuwznln
6081dac561
fix: discard_tips error
2025-08-06 19:18:35 +08:00
Xuwznln
5b2d066127
fix: drop_tips not using auto resource select
2025-08-06 19:10:04 +08:00
