makeDataType() moved to generic transfer test helpers

This commit is contained in:
Pavel Kirienko 2014-02-19 16:47:48 +04:00
parent 15d90f72e9
commit bb9d21287e
2 changed files with 11 additions and 13 deletions

View File

@ -29,18 +29,6 @@ public:
};
static uavcan::DataTypeDescriptor makeDataType(uavcan::DataTypeKind kind, uint16_t id)
{
uavcan::DataTypeDescriptor dtd(kind, id, uavcan::DataTypeHash());
for (int i = 0; i < uavcan::DataTypeHash::NUM_BYTES; i += 2)
{
dtd.hash.value[i] = id & 0xFF;
dtd.hash.value[i + 1] = id >> 8;
}
return dtd;
}
static const uavcan::NodeID SELF_NODE_ID(64);

View File

@ -209,6 +209,17 @@ std::vector<uavcan::RxFrame> serializeTransfer(const Transfer& transfer)
return output;
}
uavcan::DataTypeDescriptor makeDataType(uavcan::DataTypeKind kind, uint16_t id)
{
uavcan::DataTypeDescriptor dtd(kind, id, uavcan::DataTypeHash());
for (int i = 0; i < uavcan::DataTypeHash::NUM_BYTES; i += 2)
{
dtd.hash.value[i] = id & 0xFF;
dtd.hash.value[i + 1] = id >> 8;
}
return dtd;
}
}
@ -272,4 +283,3 @@ public:
template <int SIZE> void send(const Transfer (&transfers)[SIZE]) { send(transfers, SIZE); }
};