fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 21:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

name --> full_name

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-28 14:26:13 +04:00
parent 1c1e1b1fb9
commit 2e79b92aee
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/data_type.hpp
+4 -4
View File
@@ -89,7 +89,7 @@ class DataTypeDescriptor
DataTypeKind kind_;
uint16_t id_;
DataTypeSignature signature_;
const char* name_;
const char* full_name_;
public:
enum { MaxDataTypeID = Frame::MaxDataTypeID };
@@ -97,14 +97,14 @@ public:
DataTypeDescriptor()
: kind_(DataTypeKind(0))
, id_(0)
, name_("")
, full_name_("")
{ }
DataTypeDescriptor(DataTypeKind kind, uint16_t id, const DataTypeSignature& signature, const char* name)
: kind_(kind)
, id_(id)
, signature_(signature)
, name_(name)
, full_name_(name)
{
assert(id <= MaxDataTypeID);
assert(kind < NumDataTypeKinds);
@@ -114,7 +114,7 @@ public:
DataTypeKind getKind() const { return kind_; }
uint16_t getID() const { return id_; }
const DataTypeSignature& getSignature() const { return signature_; }
const char* getName() const { return name_; }
const char* getFullName() const { return full_name_; }
bool match(DataTypeKind kind, const char* name) const;
bool match(DataTypeKind kind, uint16_t id) const;
libuavcan/include/uavcan/global_data_type_registry.hpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
if (remove_res != RegistResultOk)
return remove_res;
entry = Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), Type::getDataTypeName());
entry = Entry(DataTypeKind(Type::DataTypeKind), id, Type::getDataTypeSignature(), Type::getDataTypeFullName());
return registImpl(&entry);
}