feat: 多ProtocolNode 允许子设备ID相同

feat: 上报发现的ActionClient
feat: Host重启动,通过discover机制要求slaveNode重新注册,实现信息及时上报
This commit is contained in:
wznln
2025-05-01 14:36:15 +08:00
parent 7a51b2adc1
commit 9d2bfec1dd
7 changed files with 119 additions and 54 deletions

View File

@@ -91,9 +91,7 @@ def slave(
# else:
# print(f"Warning: Device {device_id} could not be initialized or is not a valid Node")
machine_name = os.popen("hostname").read().strip()
machine_name = "".join([c if c.isalnum() or c == "_" else "_" for c in machine_name])
n = Node(f"slaveMachine_{machine_name}", parameter_overrides=[])
n = Node(f"slaveMachine_{BasicConfig.machine_name}", parameter_overrides=[])
executor.add_node(n)
thread = threading.Thread(target=executor.spin, daemon=True, name="slave_executor_thread")
@@ -105,7 +103,7 @@ def slave(
request = SerialCommand.Request()
request.command = json.dumps({
"machine_name": machine_name,
"machine_name": BasicConfig.machine_name,
"type": "slave",
"devices_config": devices_config_copy,
"registry_config": lab_registry.obtain_registry_device_info()