From 4d554116d88d0b213be67a3c210d9a0318f6e0ee Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Mon, 21 Jul 2014 15:57:38 +0400 Subject: [PATCH] GetNodeInfo - UAVCAN stack version removed --- dsdl/uavcan/protocol/551.GetNodeInfo.uavcan | 2 +- libuavcan/include/uavcan/build_config.hpp | 1 - libuavcan/include/uavcan/protocol/node_status_provider.hpp | 4 ---- libuavcan/src/protocol/uc_node_status_provider.cpp | 2 +- libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp | 4 ---- libuavcan/test/protocol/node_status_provider.cpp | 4 ---- 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan b/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan index 773b2f397a..01fd45e16b 100644 --- a/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan +++ b/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan @@ -7,8 +7,8 @@ # Version information shall not be changed while the node is running. HardwareVersion hardware_version SoftwareVersion software_version -SoftwareVersion uavcan_version +# Current node status NodeStatus status # Human readable non-empty ASCII node name. diff --git a/libuavcan/include/uavcan/build_config.hpp b/libuavcan/include/uavcan/build_config.hpp index 92028781d7..8d6162a4ec 100644 --- a/libuavcan/include/uavcan/build_config.hpp +++ b/libuavcan/include/uavcan/build_config.hpp @@ -10,7 +10,6 @@ */ #define UAVCAN_VERSION_MAJOR 0 #define UAVCAN_VERSION_MINOR 1 -#define UAVCAN_VERSION_BUILD 0 /** * UAVCAN can be compiled in C++11 mode. diff --git a/libuavcan/include/uavcan/protocol/node_status_provider.hpp b/libuavcan/include/uavcan/protocol/node_status_provider.hpp index 271194d518..cfded34a1f 100644 --- a/libuavcan/include/uavcan/protocol/node_status_provider.hpp +++ b/libuavcan/include/uavcan/protocol/node_status_provider.hpp @@ -57,10 +57,6 @@ public: { UAVCAN_ASSERT(!creation_timestamp_.isZero()); - node_info_.uavcan_version.major = UAVCAN_VERSION_MAJOR; - node_info_.uavcan_version.minor = UAVCAN_VERSION_MINOR; - node_info_.uavcan_version.build = UAVCAN_VERSION_BUILD; - node_info_.status.status_code = protocol::NodeStatus::STATUS_INITIALIZING; // NodeStatus TX timeout equals its publication period minus some arbitrary time gap: diff --git a/libuavcan/src/protocol/uc_node_status_provider.cpp b/libuavcan/src/protocol/uc_node_status_provider.cpp index 112916bcb7..5a35c03c9b 100644 --- a/libuavcan/src/protocol/uc_node_status_provider.cpp +++ b/libuavcan/src/protocol/uc_node_status_provider.cpp @@ -12,7 +12,7 @@ namespace uavcan bool NodeStatusProvider::isNodeInfoInitialized() const { // Hardware/Software versions are not required - return (node_info_.uavcan_version != protocol::SoftwareVersion()) && (!node_info_.name.empty()); + return !node_info_.name.empty(); } int NodeStatusProvider::publish() diff --git a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp index 2681298aed..315a7bc746 100644 --- a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp +++ b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp @@ -63,10 +63,6 @@ TEST(Dsdl, Streaming) " major: 0\n" " minor: 0\n" " build: 0\n" - "uavcan_version: \n" - " major: 0\n" - " minor: 0\n" - " build: 0\n" "status: \n" " uptime_sec: 0\n" " status_code: 0\n" diff --git a/libuavcan/test/protocol/node_status_provider.cpp b/libuavcan/test/protocol/node_status_provider.cpp index a232f5ffb0..993707dc8e 100644 --- a/libuavcan/test/protocol/node_status_provider.cpp +++ b/libuavcan/test/protocol/node_status_provider.cpp @@ -81,10 +81,6 @@ TEST(NodeStatusProvider, Basic) ASSERT_TRUE(hwver == gni_cln.collector.result->response.hardware_version); ASSERT_TRUE(swver == gni_cln.collector.result->response.software_version); - ASSERT_EQ(UAVCAN_VERSION_MAJOR, gni_cln.collector.result->response.uavcan_version.major); - ASSERT_EQ(UAVCAN_VERSION_MINOR, gni_cln.collector.result->response.uavcan_version.minor); - ASSERT_EQ(UAVCAN_VERSION_BUILD, gni_cln.collector.result->response.uavcan_version.build); - ASSERT_EQ("superluminal_communication_unit", gni_cln.collector.result->response.name); /*