fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-05 18:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

NodeStatusMonitor logic fix

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-09 01:49:45 +03:00
parent 9c2a61e0fd
commit 9ac61008b1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/node_status_monitor.hpp
+2 -2
View File
@@ -150,9 +150,9 @@ private:
if (entry.time_since_last_update_ms100 >= OfflineTimeoutMs100)
{
Entry new_entry_value;
Entry new_entry_value = entry;
new_entry_value.time_since_last_update_ms100 = OfflineTimeoutMs100;
new_entry_value.status = NodeStatus();
new_entry_value.status.mode = protocol::NodeStatus::MODE_OFFLINE;
changeNodeStatus(nid, new_entry_value);
}
}
libuavcan/test/protocol/node_status_monitor.cpp
+4 -4
View File
@@ -111,11 +111,11 @@ TEST(NodeStatusMonitor, Basic)
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(10)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(10)).mode);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(9)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(9)).mode);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_EQ(NodeStatus::HEALTH_WARNING, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(11)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(11)).mode);
@@ -143,11 +143,11 @@ TEST(NodeStatusMonitor, Basic)
*/
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(10)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(10)).mode);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(9)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(9)).mode);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_EQ(NodeStatus::HEALTH_WARNING, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(11)));
ASSERT_EQ(NodeStatus::MODE_OPERATIONAL, nsm.getNodeStatus(uavcan::NodeID(11)).mode);