From bb5f77857dd5c8cd41c4f549f2228f604f89f466 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Sat, 15 Mar 2014 11:55:56 +0400
Subject: [PATCH] Changes in uavcan.protocol.GetNodeInfo

---
 dsdl/uavcan/protocol/551.GetNodeInfo.uavcan               | 6 +++---
 .../protocol/{Version.uavcan => HardwareVersion.uavcan}   | 2 +-
 dsdl/uavcan/protocol/SoftwareVersion.uavcan               | 8 ++++++++
 libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp    | 8 +++++---
 4 files changed, 17 insertions(+), 7 deletions(-)
 rename dsdl/uavcan/protocol/{Version.uavcan => HardwareVersion.uavcan} (52%)
 create mode 100644 dsdl/uavcan/protocol/SoftwareVersion.uavcan

diff --git a/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan b/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan
index 1a5f773d99..0b5ee277e2 100644
--- a/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan
+++ b/dsdl/uavcan/protocol/551.GetNodeInfo.uavcan
@@ -4,9 +4,9 @@
 
 ---
 
-Version software_version
-Version hardware_version
-Version uavcan_version
+HardwareVersion hardware_version
+SoftwareVersion software_version
+SoftwareVersion uavcan_version
 
 NodeStatus status
 
diff --git a/dsdl/uavcan/protocol/Version.uavcan b/dsdl/uavcan/protocol/HardwareVersion.uavcan
similarity index 52%
rename from dsdl/uavcan/protocol/Version.uavcan
rename to dsdl/uavcan/protocol/HardwareVersion.uavcan
index 197f00bfa2..5692bdaa32 100644
--- a/dsdl/uavcan/protocol/Version.uavcan
+++ b/dsdl/uavcan/protocol/HardwareVersion.uavcan
@@ -1,6 +1,6 @@
 #
 # Nested type.
-# Generic version information.
+# Generic hardware version information.
 #
 
 uint8 major
diff --git a/dsdl/uavcan/protocol/SoftwareVersion.uavcan b/dsdl/uavcan/protocol/SoftwareVersion.uavcan
new file mode 100644
index 0000000000..59c61cd0c9
--- /dev/null
+++ b/dsdl/uavcan/protocol/SoftwareVersion.uavcan
@@ -0,0 +1,8 @@
+#
+# Nested type.
+# Generic software version information.
+#
+
+uint8 major
+uint8 minor
+uint32 build  # VCS revision hash, build date, etc
diff --git a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
index 9ceba45950..7383a83328 100644
--- a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
+++ b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
@@ -65,15 +65,17 @@ TEST(Dsdl, Streaming)
         "msgid: 0\n"
         "payload: \"Here\\x09goes\\x0Apayload\"\n"
         "==========\n"
-        "software_version: \n"
-        "  major: 0\n"
-        "  minor: 0\n"
         "hardware_version: \n"
         "  major: 0\n"
         "  minor: 0\n"
+        "software_version: \n"
+        "  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"