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

DSDL catchup

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-05 09:27:22 +03:00
parent a25a9252a7
commit 27ec2419ff
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/protocol/data_type_info_provider.cpp
+10 -10
View File
@@ -19,7 +19,7 @@ using uavcan::MonotonicDuration;
template <typename DataType>
static bool validateDataTypeInfoResponse(const std::auto_ptr<ServiceCallResultCollector<GetDataTypeInfo>::Result>& resp,
unsigned mask)
unsigned flags)
{
if (!resp.get())
{
@@ -43,7 +43,7 @@ static bool validateDataTypeInfoResponse(const std::auto_ptr<ServiceCallResultCo
std::cout << "Signature mismatch" << std::endl;
return false;
}
if (resp->getResponse().mask != mask)
if (resp->getResponse().flags != flags)
{
std::cout << "Mask mismatch" << std::endl;
return false;
@@ -90,8 +90,8 @@ TEST(DataTypeInfoProvider, Basic)
nodes.spinBoth(MonotonicDuration::fromMSec(10));
ASSERT_TRUE(validateDataTypeInfoResponse<GetDataTypeInfo>(gdti_cln.collector.result,
GetDataTypeInfo::Response::MASK_KNOWN |
GetDataTypeInfo::Response::MASK_SERVING));
GetDataTypeInfo::Response::FLAG_KNOWN |
GetDataTypeInfo::Response::FLAG_SERVING));
ASSERT_EQ(1, gdti_cln.collector.result->getCallID().server_node_id.get());
/*
@@ -105,8 +105,8 @@ TEST(DataTypeInfoProvider, Basic)
nodes.spinBoth(MonotonicDuration::fromMSec(10));
ASSERT_TRUE(validateDataTypeInfoResponse<GetDataTypeInfo>(gdti_cln.collector.result,
GetDataTypeInfo::Response::MASK_KNOWN |
GetDataTypeInfo::Response::MASK_SERVING));
GetDataTypeInfo::Response::FLAG_KNOWN |
GetDataTypeInfo::Response::FLAG_SERVING));
ASSERT_EQ(1, gdti_cln.collector.result->getCallID().server_node_id.get());
/*
@@ -119,7 +119,7 @@ TEST(DataTypeInfoProvider, Basic)
nodes.spinBoth(MonotonicDuration::fromMSec(10));
ASSERT_TRUE(validateDataTypeInfoResponse<NodeStatus>(gdti_cln.collector.result,
GetDataTypeInfo::Response::MASK_KNOWN));
GetDataTypeInfo::Response::FLAG_KNOWN));
/*
* Starting publisher and subscriber for NodeStatus, requesting info again
@@ -135,9 +135,9 @@ TEST(DataTypeInfoProvider, Basic)
nodes.spinBoth(MonotonicDuration::fromMSec(10));
ASSERT_TRUE(validateDataTypeInfoResponse<NodeStatus>(gdti_cln.collector.result,
GetDataTypeInfo::Response::MASK_KNOWN |
GetDataTypeInfo::Response::MASK_PUBLISHING |
GetDataTypeInfo::Response::MASK_SUBSCRIBED));
GetDataTypeInfo::Response::FLAG_KNOWN |
GetDataTypeInfo::Response::FLAG_PUBLISHING |
GetDataTypeInfo::Response::FLAG_SUBSCRIBED));
/*
* Requesting a non-existent type
libuavcan/test/protocol/node_status_provider.cpp
+3 -3
View File
@@ -46,15 +46,15 @@ TEST(NodeStatusProvider, Basic)
ASSERT_LE(0, nsp.startAndPublish());
// Checking the publishing rate settings
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS),
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_BROADCASTING_PERIOD_MS),
nsp.getStatusPublicationPeriod());
nsp.setStatusPublicationPeriod(uavcan::MonotonicDuration());
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MIN_PUBLICATION_PERIOD_MS),
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MIN_BROADCASTING_PERIOD_MS),
nsp.getStatusPublicationPeriod());
nsp.setStatusPublicationPeriod(uavcan::MonotonicDuration::fromMSec(3600 * 1000 * 24));
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_PUBLICATION_PERIOD_MS),
ASSERT_EQ(uavcan::MonotonicDuration::fromMSec(uavcan::protocol::NodeStatus::MAX_BROADCASTING_PERIOD_MS),
nsp.getStatusPublicationPeriod());
/*