diff --git a/src/drivers/uavcan/node_info.cpp b/src/drivers/uavcan/node_info.cpp index 24c82024325..f1188c6a96f 100644 --- a/src/drivers/uavcan/node_info.cpp +++ b/src/drivers/uavcan/node_info.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2025 PX4 Development Team. All rights reserved. + * Copyright (c) 2026 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -54,18 +54,15 @@ NodeInfoPublisher::~NodeInfoPublisher() void NodeInfoPublisher::handleNodeInfoRetrieved(uavcan::NodeID node_id, const uavcan::protocol::GetNodeInfo_::Response &node_info) { - const NodeInfo info(node_id, node_info); - NodeVendor vendor = NodeVendor::UNKNOWN; - if (strstr(info.name, "iq_motion") != nullptr) { + if (strstr(node_info.name.c_str(), "iq_motion") != nullptr) { vendor = NodeVendor::VERTIQ; } _node_vendors[node_id.get()] = vendor; - registerNodeInfo(info.node_id.get(), info); - + registerNodeInfo(node_id.get(), node_info); startTimerIfNotRunning(); } @@ -86,7 +83,7 @@ void NodeInfoPublisher::startTimerIfNotRunning() } } -void NodeInfoPublisher::registerNodeInfo(uint8_t node_id, const NodeInfo &info) +void NodeInfoPublisher::registerNodeInfo(uint8_t node_id, const uavcan::protocol::GetNodeInfo_::Response &node_info) { bool found = false; @@ -96,7 +93,7 @@ void NodeInfoPublisher::registerNodeInfo(uint8_t node_id, const NodeInfo &info) found = true; if (!_device_informations[i].has_node_info) { - populateDeviceInfoFields(_device_informations[i], info); + populateDeviceInfoFields(_device_informations[i], node_info); if (_device_informations[i].capability != DeviceCapability::NONE) { publishSingleDeviceInformation(_device_informations[i]); @@ -107,7 +104,7 @@ void NodeInfoPublisher::registerNodeInfo(uint8_t node_id, const NodeInfo &info) if (!found && extendDeviceInformationsArray()) { _device_informations[_device_informations_size - 1] = DeviceInformation(); _device_informations[_device_informations_size - 1].node_id = node_id; - populateDeviceInfoFields(_device_informations[_device_informations_size - 1], info); + populateDeviceInfoFields(_device_informations[_device_informations_size - 1], node_info); } } @@ -216,8 +213,8 @@ void NodeInfoPublisher::publishSingleDeviceInformation(const DeviceInformation & // Format version integers to strings at publish time snprintf(msg.firmware_version, sizeof(msg.firmware_version), - "%d.%d.%lu", device_info.fw_major, device_info.fw_minor, - static_cast(device_info.fw_patch)); + "%d.%d.%lu", device_info.sw_major, device_info.sw_minor, + static_cast(device_info.sw_vcs_commit)); snprintf(msg.hardware_version, sizeof(msg.hardware_version), "%d.%d", device_info.hw_major, device_info.hw_minor); @@ -228,24 +225,23 @@ void NodeInfoPublisher::publishSingleDeviceInformation(const DeviceInformation & static_cast(device_info.capability)); } -void NodeInfoPublisher::populateDeviceInfoFields(DeviceInformation &device_info, const NodeInfo &info) +void NodeInfoPublisher::populateDeviceInfoFields(DeviceInformation &device_info, const uavcan::protocol::GetNodeInfo_::Response &node_info) { device_info.has_node_info = true; - snprintf(device_info.name, sizeof(device_info.name), "%s", info.name); + snprintf(device_info.name, sizeof(device_info.name), "%s", node_info.name.c_str()); - device_info.fw_major = info.sw_major; - device_info.fw_minor = info.sw_minor; - device_info.fw_patch = info.vcs_commit; - device_info.hw_major = info.hw_major; - device_info.hw_minor = info.hw_minor; + device_info.sw_major = node_info.software_version.major; + device_info.sw_minor = node_info.software_version.minor; + device_info.sw_vcs_commit = node_info.software_version.vcs_commit; + device_info.hw_major = node_info.hardware_version.major; + device_info.hw_minor = node_info.hardware_version.minor; + const auto &uid = node_info.hardware_version.unique_id; snprintf(device_info.serial_number, sizeof(device_info.serial_number), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - info.unique_id[0], info.unique_id[1], info.unique_id[2], info.unique_id[3], - info.unique_id[4], info.unique_id[5], info.unique_id[6], info.unique_id[7], - info.unique_id[8], info.unique_id[9], info.unique_id[10], info.unique_id[11], - info.unique_id[12], info.unique_id[13], info.unique_id[14], info.unique_id[15]); + uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6], uid[7], + uid[8], uid[9], uid[10], uid[11], uid[12], uid[13], uid[14], uid[15]); } bool NodeInfoPublisher::extendDeviceInformationsArray() diff --git a/src/drivers/uavcan/node_info.hpp b/src/drivers/uavcan/node_info.hpp index aea32508b91..c305186dc8c 100644 --- a/src/drivers/uavcan/node_info.hpp +++ b/src/drivers/uavcan/node_info.hpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2025 PX4 Development Team. All rights reserved. + * Copyright (c) 2026 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -85,29 +85,6 @@ public: } private: - struct NodeInfo { - NodeInfo(uavcan::NodeID id, const uavcan::protocol::GetNodeInfo_::Response &node_info) - : node_id(id), sw_major(node_info.software_version.major), sw_minor(node_info.software_version.minor), - vcs_commit(node_info.software_version.vcs_commit), hw_major(node_info.hardware_version.major), - hw_minor(node_info.hardware_version.minor) - { - memcpy(name, node_info.name.c_str(), node_info.name.capacity()); - name[node_info.name.capacity() - 1] = '\0'; - memcpy(unique_id, &node_info.hardware_version.unique_id.front(), node_info.hardware_version.unique_id.size()); - } - NodeInfo() = default; - - uavcan::NodeID node_id{}; - - char name[uavcan::protocol::GetNodeInfo_::Response::FieldTypes::name::MaxSize]; - uint8_t unique_id[uavcan::protocol::GetNodeInfo_::Response::FieldTypes::hardware_version::FieldTypes::unique_id::MaxSize]; - uint8_t sw_major; - uint8_t sw_minor; - uint32_t vcs_commit; - uint8_t hw_major; - uint8_t hw_minor; - }; - struct DeviceInformation { uint8_t node_id{UINT8_MAX}; uint32_t device_id{UINT32_MAX}; @@ -115,14 +92,11 @@ private: bool has_node_info{false}; char name[80] = ""; - - // Version stored as integers to save RAM; formatted to string at publish time - uint8_t fw_major{0}; - uint8_t fw_minor{0}; - uint32_t fw_patch{0}; // VCS commit hash for DroneCAN + uint8_t sw_major{0}; + uint8_t sw_minor{0}; + uint32_t sw_vcs_commit{0}; uint8_t hw_major{0}; uint8_t hw_minor{0}; - char serial_number[33] = ""; }; @@ -134,7 +108,7 @@ private: void startTimerIfNotRunning(); - void registerNodeInfo(uint8_t node_id, const NodeInfo &info); + void registerNodeInfo(uint8_t node_id, const uavcan::protocol::GetNodeInfo_::Response &node_info); void registerCapability(uint8_t node_id, uint32_t device_id, DeviceCapability capability); // Publishing methods @@ -142,7 +116,7 @@ private: void publishSingleDeviceInformation(const DeviceInformation &device_info); // Helper functions - void populateDeviceInfoFields(DeviceInformation &device_info, const NodeInfo &info); + void populateDeviceInfoFields(DeviceInformation &device_info, const uavcan::protocol::GetNodeInfo_::Response &node_info); bool extendDeviceInformationsArray(); uavcan::NodeInfoRetriever &_node_info_retriever;