diff --git a/unilabos/app/main.py b/unilabos/app/main.py index c652757c..93751262 100644 --- a/unilabos/app/main.py +++ b/unilabos/app/main.py @@ -1,6 +1,7 @@ import argparse import asyncio import os +import platform import shutil import signal import sys @@ -358,7 +359,7 @@ def main(): if BasicConfig.test_mode: print_status("启用测试模式:所有动作将模拟执行,不调用真实硬件", "warning") BasicConfig.communication_protocol = "websocket" - machine_name = os.popen("hostname").read().strip() + machine_name = platform.node() machine_name = "".join([c if c.isalnum() or c == "_" else "_" for c in machine_name]) BasicConfig.machine_name = machine_name BasicConfig.vis_2d_enable = args_dict["2d_vis"] diff --git a/unilabos/resources/container.py b/unilabos/resources/container.py index fe19bacf..ed3871d3 100644 --- a/unilabos/resources/container.py +++ b/unilabos/resources/container.py @@ -1,10 +1,6 @@ -import json from typing import Dict, Any from pylabrobot.resources import Container -from unilabos_msgs.msg import Resource - -from unilabos.ros.msgs.message_converter import convert_from_ros_msg class RegularContainer(Container): @@ -16,12 +12,12 @@ class RegularContainer(Container): kwargs["size_y"] = 0 if "size_z" not in kwargs: kwargs["size_z"] = 0 + self.kwargs = kwargs - self.state = {} super().__init__(*args, category="container", **kwargs) def load_state(self, state: Dict[str, Any]): - self.state = state + super().load_state(state) def get_regular_container(name="container"): @@ -29,7 +25,6 @@ def get_regular_container(name="container"): r.category = "container" return r -# # class RegularContainer(object): # # 第一个参数必须是id传入 # # noinspection PyShadowingBuiltins @@ -89,4 +84,4 @@ def get_regular_container(name="container"): # return to_dict # # def __str__(self): -# return f"{self.id}" \ No newline at end of file +# return f"{self.id}"