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

fix state loading for regular container

Browse Source
This commit is contained in:
Xuwznln
2025-10-16 14:04:03 +08:00
parent c75b7d5aae
commit 3757bd9c58
2 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,12 +178,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [["DMF", 500.0]],
{ "pending_liquids": [["DMF", 500.0]]
"liquid_type": "DMF",
"liquid_volume": 1000.0
}
]
} }
}, },
{ {
@@ -207,12 +203,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [["ethyl_acetate", 1000.0]],
{ "pending_liquids": [["ethyl_acetate", 1000.0]]
"liquid_type": "ethyl_acetate",
"liquid_volume": 1000.0
}
]
} }
}, },
{ {
@@ -236,12 +228,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [["hexane", 1000.0]],
{ "pending_liquids": [["hexane", 1000.0]]
"liquid_type": "hexane",
"liquid_volume": 1000.0
}
]
} }
}, },
{ {
@@ -265,12 +253,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [["methanol", 1000.0]],
{ "pending_liquids": [["methanol", 1000.0]]
"liquid_type": "methanol",
"liquid_volume": 1000.0
}
]
} }
}, },
{ {
@@ -294,12 +278,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [["water", 1000.0]],
{ "pending_liquids": [["water", 1000.0]]
"liquid_type": "water",
"liquid_volume": 1000.0
}
]
} }
}, },
{ {
@@ -368,8 +348,8 @@
"has_heater": true "has_heater": true
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {
@@ -454,8 +434,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {
@@ -479,8 +459,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {
@@ -694,8 +674,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {
@@ -719,8 +699,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {
@@ -744,8 +724,8 @@
"size_z": 0 "size_z": 0
}, },
"data": { "data": {
"liquids": [ "liquids": [],
] "pending_liquids": []
} }
}, },
{ {

5
unilabos/resources/container.py
View File

@@ -1,4 +1,5 @@
import json import json
from typing import Dict, Any
from pylabrobot.resources import Container from pylabrobot.resources import Container
from unilabos_msgs.msg import Resource from unilabos_msgs.msg import Resource
@@ -15,9 +16,11 @@ class RegularContainer(Container):
if "size_z" not in kwargs: if "size_z" not in kwargs:
kwargs["size_z"] = 0 kwargs["size_z"] = 0
self.kwargs = kwargs self.kwargs = kwargs
self.state = {}
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
def load_state(self, state: Dict[str, Any]):
self.state = state
# #
# class RegularContainer(object): # class RegularContainer(object):
# # 第一个参数必须是id传入 # # 第一个参数必须是id传入