open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/dptech-corp/Uni-Lab-OS.git synced 2025-12-18 13:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squash merge from dev

Browse Source 
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>
This commit is contained in:
Junhan Chang
2025-08-03 11:21:37 +08:00
committed by Xuwznln
parent a555c59dc2
commit 0bfb52df00
97 changed files with 5033 additions and 164837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
test/experiments/comprehensive_protocol/comprehensive_station.json
View File

@@ -49,7 +49,6 @@
"config": {
"protocol_type": [
"AddProtocol",
"TransferProtocol",
"StartStirProtocol",
"StopStirProtocol",
"StirProtocol",
@@ -171,12 +170,15 @@
"z": 0
},
"config": {
"volume": 1000.0,
"reagent": "DMF"
"max_volume": 1000.0
},
"data": {
"current_volume": 1000.0,
"reagent_name": "DMF"
"liquids": [
{
"liquid_type": "DMF",
"liquid_volume": 1000.0
}
]
}
},
{
@@ -192,12 +194,15 @@
"z": 0
},
"config": {
"volume": 1000.0,
"reagent": "ethyl_acetate"
"max_volume": 1000.0
},
"data": {
"current_volume": 1000.0,
"reagent_name": "ethyl_acetate"
"liquids": [
{
"liquid_type": "ethyl_acetate",
"liquid_volume": 1000.0
}
]
}
},
{
@@ -213,12 +218,15 @@
"z": 0
},
"config": {
"volume": 1000.0,
"reagent": "hexane"
"max_volume": 1000.0
},
"data": {
"current_volume": 1000.0,
"reagent_name": "hexane"
"liquids": [
{
"liquid_type": "hexane",
"liquid_volume": 1000.0
}
]
}
},
{
@@ -234,12 +242,15 @@
"z": 0
},
"config": {
"volume": 1000.0,
"reagent": "methanol"
"max_volume": 1000.0
},
"data": {
"current_volume": 1000.0,
"reagent_name": "methanol"
"liquids": [
{
"liquid_type": "methanol",
"liquid_volume": 1000.0
}
]
}
},
{
@@ -255,12 +266,15 @@
"z": 0
},
"config": {
"volume": 1000.0,
"reagent": "water"
"max_volume": 1000.0
},
"data": {
"current_volume": 1000.0,
"reagent_name": "water"
"liquids": [
{
"liquid_type": "water",
"liquid_volume": 1000.0
}
]
}
},
{
@@ -320,15 +334,15 @@
"z": 0
},
"config": {
"volume": 500.0,
"max_volume": 500.0,
"max_temp": 200.0,
"min_temp": -20.0,
"has_stirrer": true,
"has_heater": true
},
"data": {
"current_volume": 0.0,
"current_temp": 25.0
"liquids": [
]
}
},
{
@@ -405,10 +419,11 @@
"z": 0
},
"config": {
"volume": 2000.0
"max_volume": 2000.0
},
"data": {
"current_volume": 0.0
"liquids": [
]
}
},
{
@@ -424,10 +439,11 @@
"z": 0
},
"config": {
"volume": 2000.0
"max_volume": 2000.0
},
"data": {
"current_volume": 0.0
"liquids": [
]
}
},
{
@@ -633,10 +649,11 @@
"z": 0
},
"config": {
"volume": 250.0
"max_volume": 250.0
},
"data": {
"current_volume": 0.0
"liquids": [
]
}
},
{
@@ -652,10 +669,11 @@
"z": 0
},
"config": {
"volume": 250.0
"max_volume": 250.0
},
"data": {
"current_volume": 0.0
"liquids": [
]
}
},
{
@@ -671,10 +689,11 @@
"z": 0
},
"config": {
"volume": 250.0
"max_volume": 250.0
},
"data": {
"current_volume": 0.0
"liquids": [
]
}
},
{
@@ -713,7 +732,7 @@
"z": 0
},
"config": {
"volume": 500.0,
"max_volume": 500.0,
"reagent": "sodium_chloride",
"physical_state": "solid"
},
@@ -1077,7 +1096,7 @@
"target": "solid_dispenser_1",
"type": "resource",
"port": {
"solid_reagent_bottle_1": "top",
"solid_reagent_bottle_1": "bottom",
"solid_dispenser_1": "SolidIn"
}
},
@@ -1087,7 +1106,7 @@
"target": "solid_dispenser_1",
"type": "resource",
"port": {
"solid_reagent_bottle_2": "top",
"solid_reagent_bottle_2": "bottom",
"solid_dispenser_1": "SolidIn"
}
},
@@ -1097,7 +1116,7 @@
"target": "solid_dispenser_1",
"type": "resource",
"port": {
"solid_reagent_bottle_3": "top",
"solid_reagent_bottle_3": "bottom",
"solid_dispenser_1": "SolidIn"
}
}