open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/dptech-corp/Uni-Lab-OS.git synced 2026-02-04 13:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复不启用注册表补充就无法启动的bug

Browse Source
This commit is contained in:
Xuwznln
2025-06-28 01:32:10 +08:00
parent 15f3f8518b
commit 817e88cfc4
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
unilabos/registry/registry.py
View File

@@ -298,9 +298,9 @@ class Registry:
enhanced_info = {} enhanced_info = {}
if complete_registry: if complete_registry:
enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True) enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True)
device_config["class"]["status_types"].update( device_config["class"]["status_types"].update(
{k: v["return_type"] for k, v in enhanced_info["status_methods"].items()} {k: v["return_type"] for k, v in enhanced_info["status_methods"].items()}
) )
for status_name, status_type in device_config["class"]["status_types"].items(): for status_name, status_type in device_config["class"]["status_types"].items():
if status_type in ["Any", "None"]: if status_type in ["Any", "None"]:
status_type = "String" # 替换成ROS的String，便于显示 status_type = "String" # 替换成ROS的String，便于显示
@@ -310,24 +310,25 @@ class Registry:
device_config["class"]["status_types"] = dict( device_config["class"]["status_types"] = dict(
sorted(device_config["class"]["status_types"].items()) sorted(device_config["class"]["status_types"].items())
) )
# 处理动作值映射 if complete_registry:
device_config["class"]["action_value_mappings"].update( # 处理动作值映射
{ device_config["class"]["action_value_mappings"].update(
f"auto-{k}": { {
"type": "UniLabJsonCommandAsync" if v["is_async"] else "UniLabJsonCommand", f"auto-{k}": {
"goal": {}, "type": "UniLabJsonCommandAsync" if v["is_async"] else "UniLabJsonCommand",
"feedback": {}, "goal": {},
"result": {}, "feedback": {},
"schema": self._generate_unilab_json_command_schema(v["args"], k), "result": {},
"goal_default": {i["name"]: i["default"] for i in v["args"]}, "schema": self._generate_unilab_json_command_schema(v["args"], k),
"handles": [], "goal_default": {i["name"]: i["default"] for i in v["args"]},
"handles": [],
}
for k, v in enhanced_info["action_methods"].items()
} }
for k, v in enhanced_info["action_methods"].items() )
} device_config["init_param_schema"] = self._generate_unilab_json_command_schema(
) enhanced_info["init_params"], "__init__"
device_config["init_param_schema"] = self._generate_unilab_json_command_schema( )
enhanced_info["init_params"], "__init__"
)
device_config.pop("schema", None) device_config.pop("schema", None)
device_config["class"]["action_value_mappings"] = dict( device_config["class"]["action_value_mappings"] = dict(
sorted(device_config["class"]["action_value_mappings"].items()) sorted(device_config["class"]["action_value_mappings"].items())