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 49354fcf39)

* remove runze multiple software obtainer

(cherry picked from commit 8bcc92a394)

* support multiple backbone

(cherry picked from commit 4771ff2347)

* Update runze pump format

* Correct runze multiple backbone

* Update runze_multiple_backbone

* Correct runze pump multiple receive method.

* Correct runze pump multiple receive method.

* 对于PRCXI9320的transfer_group,一对多和多对多

* 移除MQTT,更新launch文档,提供注册表示例文件,更新到0.10.5

* fix import error

* fix dupe upload registry

* refactor ws client

* add server timeout

* Fix: run-column with correct vessel id (#86)

* fix run_column

* Update run_column_protocol.py

(cherry picked from commit e5aa4d940a)

* resource_update use resource_add

* 新增版位推荐功能

* 重新规定了版位推荐的入参

* update registry with nested obj

* fix protocol node log_message, added create_resource return value

* fix protocol node log_message, added create_resource return value

* try fix add protocol

* fix resource_add

* 修复移液站错误的aspirate注册表

* Feature/xprbalance-zhida (#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)

* update conda-pack-build.yml

* update conda-pack-build.yml

* update conda-pack-build.yml

* update conda-pack-build.yml

* update conda-pack-build.yml

* Add version in __init__.py
Update conda-pack-build.yml
Add create_zip_archive.py

* Update conda-pack-build.yml

* Update conda-pack-build.yml (with mamba)

* Update conda-pack-build.yml

* Fix FileNotFoundError

* Try fix 'charmap' codec can't encode characters in position 16-23: character maps to <undefined>

* Fix unilabos msgs search error

* Fix environment_check.py

* Update recipe.yaml

* Update registry. Update uuid loop figure method. Update install docs.

* Fix nested conda pack

* Fix one-key installation path error

* Bump version to 0.10.7

* 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__ 导出列表
- 确保所有主要类都可以正确导入

* 修复大小写文件夹名字

* 电池装配工站二次开发教程(带目录)上传至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>
This commit is contained in:
Xuwznln
2025-10-12 23:34:26 +08:00
committed by GitHub
parent 172599adcf
commit 9aeffebde1
229 changed files with 136969 additions and 17429 deletions

View File

@@ -68,12 +68,10 @@ set(action_files
"action/LiquidHandlerSetTipRack.action"
"action/LiquidHandlerStamp.action"
"action/LiquidHandlerTransfer.action"
"action/LiquidHandlerTransferBiomek.action"
"action/LiquidHandlerIncubateBiomek.action"
"action/LiquidHandlerMoveBiomek.action"
"action/LiquidHandlerOscillateBiomek.action"
"action/LiquidHandlerAdd.action"
"action/LiquidHandlerMix.action"
"action/LiquidHandlerMoveTo.action"
@@ -98,6 +96,23 @@ set(action_files
"action/WorkStationRun.action"
"action/AGVTransfer.action"
"action/DispenStationSolnPrep.action"
"action/DispenStationVialFeed.action"
"action/PostProcessGrab.action"
"action/PostProcessTriggerClean.action"
"action/PostProcessTriggerPostPro.action"
"action/ReactionStationDripBack.action"
"action/ReactionStationLiquidFeedBeaker.action"
"action/ReactionStationLiquidFeedSolvents.action"
"action/ReactionStationLiquidFeedTitration.action"
"action/ReactionStationLiquidFeedVialsNonTitration.action"
"action/ReactionStationProExecu.action"
"action/ReactionStationReactorTakenOut.action"
"action/ReactionStationReaTackIn.action"
"action/ReactionStationSolidFeedVial.action"
)
set(srv_files

View File

@@ -0,0 +1,4 @@
Tuple[] needs
---
Dict return_info
---

View File

@@ -0,0 +1,15 @@
# Goal - (二胺)溶液配置
string order_name # 任务名称
string material_name #固体物料名称
string target_weigh #固体重量
string volume #液体体积
string liquid_material_name # 溶剂名称
string speed #磁力转动速度
string temperature #温度
string delay_time #等待时间
string hold_m_name #样品名称
---
# Result - 操作结果
string return_info # 结果消息
---
# Feedback - 实时反馈

View File

@@ -0,0 +1,29 @@
# Goal - 小瓶投料
string order_name # 任务名称
string percent_90_1_assign_material_name
string percent_90_1_target_weigh
string percent_90_2_assign_material_name
string percent_90_2_target_weigh
string percent_90_3_assign_material_name
string percent_90_3_target_weigh
string percent_10_1_assign_material_name
string percent_10_1_target_weigh
string percent_10_1_volume
string percent_10_1_liquid_material_name
string percent_10_2_assign_material_name
string percent_10_2_target_weigh
string percent_10_2_volume
string percent_10_2_liquid_material_name
string percent_10_3_assign_material_name
string percent_10_3_target_weigh
string percent_10_3_volume
string percent_10_3_liquid_material_name
string speed
string temperature
string delay_time
string hold_m_name
---
# Result - 操作结果
string return_info # 结果消息
---
# Feedback - 实时反馈

View File

@@ -0,0 +1,8 @@
string group_name
Resource[] wells
float64[] volumes
---
string return_info
bool success
---
# 反馈

View File

@@ -13,7 +13,7 @@ float64[] blow_out_air_volume
string spread
bool is_96_well
string mix_stage
int32[] mix_times
int32 mix_times
int32 mix_vol
int32 mix_rate
float64 mix_liquid_height

View File

@@ -0,0 +1,8 @@
string source_group_name
string target_group_name
float64 unit_volume
---
string return_info
bool success
---
# 反馈

View File

@@ -0,0 +1,8 @@
# Goal - 抓取参数
int32 reaction_tank_number #反应罐号码
int32 raw_tank_number #原料罐号码
---
# Result - 操作结果
string return_info
---
# Feedback - 实时反馈

View File

@@ -0,0 +1,46 @@
# Goal - 清洗参数
float64 nmp_outer_wall_cleaning_injection
int32 nmp_outer_wall_cleaning_count
int32 nmp_outer_wall_cleaning_wait_time
int32 nmp_outer_wall_cleaning_waste_time
float64 nmp_inner_wall_cleaning_injection
int32 nmp_inner_wall_cleaning_count
int32 nmp_pump_cleaning_suction_count
int32 nmp_inner_wall_cleaning_waste_time
float64 nmp_stirrer_cleaning_injection
int32 nmp_stirrer_cleaning_count
int32 nmp_stirrer_cleaning_wait_time
int32 nmp_stirrer_cleaning_waste_time
float64 water_outer_wall_cleaning_injection
int32 water_outer_wall_cleaning_count
int32 water_outer_wall_cleaning_wait_time
int32 water_outer_wall_cleaning_waste_time
float64 water_inner_wall_cleaning_injection
int32 water_inner_wall_cleaning_count
int32 water_pump_cleaning_suction_count
int32 water_inner_wall_cleaning_waste_time
float64 water_stirrer_cleaning_injection
int32 water_stirrer_cleaning_count
int32 water_stirrer_cleaning_wait_time
int32 water_stirrer_cleaning_waste_time
float64 acetone_outer_wall_cleaning_injection
int32 acetone_outer_wall_cleaning_count
int32 acetone_outer_wall_cleaning_wait_time
int32 acetone_outer_wall_cleaning_waste_time
float64 acetone_inner_wall_cleaning_injection
int32 acetone_inner_wall_cleaning_count
int32 acetone_pump_cleaning_suction_count
int32 acetone_inner_wall_cleaning_waste_time
float64 acetone_stirrer_cleaning_injection
int32 acetone_stirrer_cleaning_count
int32 acetone_stirrer_cleaning_wait_time
int32 acetone_stirrer_cleaning_waste_time
int32 pipe_blowing_time
int32 injection_pump_forward_empty_suction_count
int32 injection_pump_reverse_empty_suction_count
int32 filtration_liquid_selection
---
# Result - 操作结果
string return_info # 操作是否成功
---
# Feedback - 实时反馈

View File

@@ -0,0 +1,20 @@
# Goal - 后处理参数
float64 atomization_fast_speed
float64 wash_slow_speed
int32 injection_pump_suction_speed
int32 injection_pump_push_speed
int32 raw_liquid_suction_count
float64 first_wash_water_amount
float64 second_wash_water_amount
int32 first_powder_mixing_tim
int32 second_powder_mixing_time
int32 first_powder_wash_count
int32 second_powder_wash_count
float64 initial_water_amount
int32 pre_filtration_mixing_time
int32 atomization_pressure_kpa
---
# Result - 操作结果
string return_info # 操作是否成功
---
# Feedback - 实时反馈

View File

@@ -0,0 +1,13 @@
# Goal - 滴回去操作参数
string volume # 投料体积
string assign_material_name # 溶剂名称
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,15 @@
# Goal - 液体投料-烧杯操作参数
string volume # 投料体积
string assign_material_name # 溶剂名称
string titration_type # 滴定类型1否2是
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
string temperature # 温度设置
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,15 @@
# Goal - 液体投料-溶剂操作参数
string volume # 投料体积
string assign_material_name # 溶剂名称
string titration_type # 滴定类型1否2是
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
string temperature # 温度设置
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,15 @@
# Goal - 液体投料滴定操作参数
string volume_formula # 投料体积公式
string assign_material_name # 溶剂名称
string titration_type # 滴定类型1否2是
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
string temperature # 温度设置
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,15 @@
# Goal - 液体投料-小瓶非滴定操作参数
string volume_formula # 投料体积公式
string assign_material_name # 溶剂名称
string titration_type # 滴定类型1否2是
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
string temperature # 温度设置
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,11 @@
# Goal - 合并工作流+执行参数
string workflow_name # 工作流名称
string task_name # 任务名称
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,12 @@
# Goal - 反应器放入操作参数
string cutoff # 黏度设置
string temperature # 温度设置
string assign_material_name # 分液类型
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,12 @@
# Goal - 反应器取出操作参数
# 反应器取出操作不需要任何参数
---
# Result - 操作结果
# 反应器取出操作的结果
bool success # 要求必须包含success以便回传执行结果
string return_info # 要求必须包含return_info以便回传执行结果
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
# 反应器取出操作的反馈
string feedback # 操作过程中的反馈信息

View File

@@ -0,0 +1,13 @@
# Goal - 固体投料-小瓶操作参数
string assign_material_name # 固体名称
string material_id # 固体投料类型
string time # 观察时间单位min
string torque_variation # 是否观察1否2是
---
# Result - 操作结果
bool success # 操作是否成功
string return_info # 结果消息
int32 code # 操作结果代码1表示成功0表示失败
---
# Feedback - 实时反馈
string feedback # 操作过程中的反馈信息

View File

@@ -2,9 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>unilabos_msgs</name>
<version>0.10.4</version>
<version>0.10.7</version>
<description>ROS2 Messages package for unilabos devices</description>
<maintainer email="changjh@pku.edu.cn">Junhan Chang</maintainer>
<maintainer email="18435084+Xuwznln@users.noreply.github.com">Xuwznln</maintainer>
<license>MIT</license>
<buildtool_depend>ament_cmake</buildtool_depend>