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

Changed API of DynamicNodeIDClient: start() accepts UniqueID instead of HardwareVersion

Browse Source
This commit is contained in:
Pavel Kirienko
2015-09-25 00:02:58 +03:00
parent 50dc08663a
commit 0f53a76b50
7 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/protocol/dynamic_node_id_server/allocation_request_manager.cpp
+6 -6
View File
@@ -78,13 +78,13 @@ TEST(dynamic_node_id_server_AllocationRequestManager, Basic)
/*
* Client initialization
*/
uavcan::protocol::HardwareVersion hwver;
for (uavcan::uint8_t i = 0; i < hwver.unique_id.size(); i++)
uavcan::protocol::HardwareVersion::FieldTypes::unique_id unique_id;
for (uavcan::uint8_t i = 0; i < unique_id.size(); i++)
{
hwver.unique_id[i] = i;
unique_id[i] = i;
}
const uavcan::NodeID PreferredNodeID = 42;
ASSERT_LE(0, client.start(hwver, PreferredNodeID));
ASSERT_LE(0, client.start(unique_id, PreferredNodeID));
/*
* Request manager initialization
@@ -102,9 +102,9 @@ TEST(dynamic_node_id_server_AllocationRequestManager, Basic)
*/
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(2000));
ASSERT_TRUE(handler.matchAndPopLastRequest(hwver.unique_id, PreferredNodeID));
ASSERT_TRUE(handler.matchAndPopLastRequest(unique_id, PreferredNodeID));
ASSERT_LE(0, manager.broadcastAllocationResponse(hwver.unique_id, PreferredNodeID));
ASSERT_LE(0, manager.broadcastAllocationResponse(unique_id, PreferredNodeID));
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(100));
libuavcan/test/protocol/dynamic_node_id_server/centralized/server.cpp
+4 -4
View File
@@ -49,13 +49,13 @@ TEST(dynamic_node_id_server_centralized_Server, Basic)
* Client
*/
uavcan::DynamicNodeIDClient client(nodes.b);
uavcan::protocol::HardwareVersion hwver;
for (uavcan::uint8_t i = 0; i < hwver.unique_id.size(); i++)
uavcan::protocol::HardwareVersion::FieldTypes::unique_id unique_id;
for (uavcan::uint8_t i = 0; i < unique_id.size(); i++)
{
hwver.unique_id[i] = i;
unique_id[i] = i;
}
const uavcan::NodeID PreferredNodeID = 42;
ASSERT_LE(0, client.start(hwver, PreferredNodeID));
ASSERT_LE(0, client.start(unique_id, PreferredNodeID));
/*
* Fire
libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
+4 -4
View File
@@ -154,13 +154,13 @@ TEST(dynamic_node_id_server_Server, Basic)
* Client
*/
uavcan::DynamicNodeIDClient client(nodes.b);
uavcan::protocol::HardwareVersion hwver;
for (uavcan::uint8_t i = 0; i < hwver.unique_id.size(); i++)
uavcan::protocol::HardwareVersion::FieldTypes::unique_id unique_id;
for (uavcan::uint8_t i = 0; i < unique_id.size(); i++)
{
hwver.unique_id[i] = i;
unique_id[i] = i;
}
const uavcan::NodeID PreferredNodeID = 42;
ASSERT_LE(0, client.start(hwver, PreferredNodeID));
ASSERT_LE(0, client.start(unique_id, PreferredNodeID));
/*
* Fire