diff --git a/test/experiments/comprehensive_protocol/comprehensive_station.json b/test/experiments/comprehensive_protocol/comprehensive_station.json index 0dd4f7bd..9af64af3 100644 --- a/test/experiments/comprehensive_protocol/comprehensive_station.json +++ b/test/experiments/comprehensive_protocol/comprehensive_station.json @@ -178,12 +178,8 @@ "size_z": 0 }, "data": { - "liquids": [ - { - "liquid_type": "DMF", - "liquid_volume": 1000.0 - } - ] + "liquids": [["DMF", 500.0]], + "pending_liquids": [["DMF", 500.0]] } }, { @@ -207,12 +203,8 @@ "size_z": 0 }, "data": { - "liquids": [ - { - "liquid_type": "ethyl_acetate", - "liquid_volume": 1000.0 - } - ] + "liquids": [["ethyl_acetate", 1000.0]], + "pending_liquids": [["ethyl_acetate", 1000.0]] } }, { @@ -236,12 +228,8 @@ "size_z": 0 }, "data": { - "liquids": [ - { - "liquid_type": "hexane", - "liquid_volume": 1000.0 - } - ] + "liquids": [["hexane", 1000.0]], + "pending_liquids": [["hexane", 1000.0]] } }, { @@ -265,12 +253,8 @@ "size_z": 0 }, "data": { - "liquids": [ - { - "liquid_type": "methanol", - "liquid_volume": 1000.0 - } - ] + "liquids": [["methanol", 1000.0]], + "pending_liquids": [["methanol", 1000.0]] } }, { @@ -294,12 +278,8 @@ "size_z": 0 }, "data": { - "liquids": [ - { - "liquid_type": "water", - "liquid_volume": 1000.0 - } - ] + "liquids": [["water", 1000.0]], + "pending_liquids": [["water", 1000.0]] } }, { @@ -368,8 +348,8 @@ "has_heater": true }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { @@ -454,8 +434,8 @@ "size_z": 0 }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { @@ -479,8 +459,8 @@ "size_z": 0 }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { @@ -694,8 +674,8 @@ "size_z": 0 }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { @@ -719,8 +699,8 @@ "size_z": 0 }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { @@ -744,8 +724,8 @@ "size_z": 0 }, "data": { - "liquids": [ - ] + "liquids": [], + "pending_liquids": [] } }, { diff --git a/unilabos/resources/container.py b/unilabos/resources/container.py index cf6606ea..23b044c7 100644 --- a/unilabos/resources/container.py +++ b/unilabos/resources/container.py @@ -1,4 +1,5 @@ import json +from typing import Dict, Any from pylabrobot.resources import Container from unilabos_msgs.msg import Resource @@ -15,9 +16,11 @@ class RegularContainer(Container): if "size_z" not in kwargs: kwargs["size_z"] = 0 self.kwargs = kwargs + self.state = {} super().__init__(*args, **kwargs) - + def load_state(self, state: Dict[str, Any]): + self.state = state # # class RegularContainer(object): # # 第一个参数必须是id传入