diff --git a/unilabos/devices/neware_battery_test_system/neware_battery_test_system.py b/unilabos/devices/neware_battery_test_system/neware_battery_test_system.py index bd91957f..fea3d027 100644 --- a/unilabos/devices/neware_battery_test_system/neware_battery_test_system.py +++ b/unilabos/devices/neware_battery_test_system/neware_battery_test_system.py @@ -2019,8 +2019,6 @@ class NewareBatteryTestSystem: "active_material": active_material, "capacity": capacity, "battery_system": battery_system, - "formulations": formulations, - "assembly_data": assembly_data, "pole_weight": pole_weight, } diff --git a/unilabos/registry/devices/neware_battery_test_system.yaml b/unilabos/registry/devices/neware_battery_test_system.yaml index 5a2fc445..0ef0b0a3 100644 --- a/unilabos/registry/devices/neware_battery_test_system.yaml +++ b/unilabos/registry/devices/neware_battery_test_system.yaml @@ -378,8 +378,6 @@ neware_battery_test_system: active_material: active_material capacity: capacity battery_system: battery_system - formulations: formulations - assembly_data: assembly_data pole_weight: pole_weight schema: title: manual_confirm参数 @@ -677,16 +675,6 @@ neware_battery_test_system: label: 极片质量 data_key: pole_weight data_source: executor - - handler_key: formulations - data_type: array - label: 配方信息列表 - data_key: formulations - data_source: executor - - handler_key: assembly_data - data_type: array - label: 扣电组装数据列表 - data_key: assembly_data - data_source: executor placeholder_keys: resource: unilabos_resources target_device: unilabos_devices diff --git a/unilabos/ros/nodes/base_device_node.py b/unilabos/ros/nodes/base_device_node.py index 4fa6b1c5..466741fd 100644 --- a/unilabos/ros/nodes/base_device_node.py +++ b/unilabos/ros/nodes/base_device_node.py @@ -1971,10 +1971,15 @@ class BaseROS2DeviceNode(Node, Generic[T]): mapped_plr_resources = [] for uuid in uuids_list: + found = None for plr_resource in figured_resources: r = self.resource_tracker.loop_find_with_uuid(plr_resource, uuid) - mapped_plr_resources.append(r) - break + if r is not None: + found = r + break + if found is None: + raise Exception(f"未能在已解析的资源树中找到 uuid={uuid} 对应的资源") + mapped_plr_resources.append(found) return mapped_plr_resources @@ -2335,4 +2340,4 @@ class DeviceInfoType(TypedDict): status_publishers: Dict[str, PropertyPublisher] actions: Dict[str, ActionServer] hardware_interface: Dict[str, Any] - base_node_instance: BaseROS2DeviceNode + base_node_instance: BaseROS2DeviceNode \ No newline at end of file