From 7125eeb5c2043f458ba3f3bc5510799d6e5f5f16 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 8 Jul 2015 23:39:50 +0300 Subject: [PATCH] Blah blah --- .../test/protocol/dynamic_node_id_server/node_discoverer.cpp | 3 --- libuavcan_drivers/linux/apps/test_node.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp b/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp index a0b59b4c95..288d299b6d 100644 --- a/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp +++ b/libuavcan/test/protocol/dynamic_node_id_server/node_discoverer.cpp @@ -118,7 +118,6 @@ TEST(dynamic_node_id_server_NodeDiscoverer, Basic) ASSERT_LE(0, node_status_pub.init()); uavcan::protocol::NodeStatus node_status; - node_status.status_code = node_status.STATUS_OK; // Status will be ignored anyway node_status.uptime_sec = 0; ASSERT_LE(0, node_status_pub.broadcast(node_status)); @@ -222,7 +221,6 @@ TEST(dynamic_node_id_server_NodeDiscoverer, RestartAndMaxAttempts) ASSERT_LE(0, node_status_pub.init()); uavcan::protocol::NodeStatus node_status; - node_status.status_code = node_status.STATUS_OK; // Status will be ignored anyway node_status.uptime_sec = 10; // Nonzero ASSERT_LE(0, node_status_pub.broadcast(node_status)); @@ -240,7 +238,6 @@ TEST(dynamic_node_id_server_NodeDiscoverer, RestartAndMaxAttempts) /* * Emulating node restart */ - node_status.status_code = node_status.STATUS_OK; // Status will be ignored anyway node_status.uptime_sec = 9; // Less than previous ASSERT_LE(0, node_status_pub.broadcast(node_status)); diff --git a/libuavcan_drivers/linux/apps/test_node.cpp b/libuavcan_drivers/linux/apps/test_node.cpp index c284797aab..0b56f4ed88 100644 --- a/libuavcan_drivers/linux/apps/test_node.cpp +++ b/libuavcan_drivers/linux/apps/test_node.cpp @@ -60,8 +60,8 @@ static void runForever(const uavcan_linux::NodePtr& node) void handleNodeStatusChange(const NodeStatusChangeEvent& event) override { std::cout << "Remote node NID " << int(event.node_id.get()) << " changed status: " - << int(event.old_status.status_code) << " --> " - << int(event.status.status_code) << std::endl; + << event.old_status.toString() << " --> " + << event.status.toString() << std::endl; } };