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

Renamed some Frame methods

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-17 12:53:07 +04:00
parent 9d06a328dc
commit d3d85a671c
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/internal/transport/transfer.hpp
+5 -5
View File
@@ -110,7 +110,7 @@ class Frame
public:
enum { DATA_TYPE_ID_MAX = 1023 };
enum { FRAME_INDEX_MAX = 62 }; // 63 (or 0b111111) is reserved
enum { INDEX_MAX = 62 }; // 63 (or 0b111111) is reserved
Frame()
: transfer_type_(TransferType(NUM_TRANSFER_TYPES)) // That is invalid value
@@ -135,7 +135,7 @@ public:
assert((transfer_type == TRANSFER_TYPE_MESSAGE_BROADCAST) == dst_node_id.isBroadcast());
assert(data_type_id <= DATA_TYPE_ID_MAX);
assert(src_node_id != dst_node_id);
assert(frame_index <= FRAME_INDEX_MAX);
assert(frame_index <= INDEX_MAX);
}
int getMaxPayloadLen() const;
@@ -149,12 +149,12 @@ public:
NodeID getSrcNodeID() const { return src_node_id_; }
NodeID getDstNodeID() const { return dst_node_id_; }
TransferID getTransferID() const { return transfer_id_; }
uint_fast8_t getFrameIndex() const { return frame_index_; }
bool isLastFrame() const { return last_frame_; }
uint_fast8_t getIndex() const { return frame_index_; }
bool isLast() const { return last_frame_; }
void makeLast() { last_frame_ = true; }
bool isFirstFrame() const { return frame_index_ == 0; }
bool isFirst() const { return frame_index_ == 0; }
bool parse(const CanFrame& can_frame);
bool compile(CanFrame& can_frame) const;
libuavcan/include/uavcan/internal/transport/transfer_listener.hpp
+1 -1
View File
@@ -130,7 +130,7 @@ class TransferListener : public TransferListenerBase, Noncopyable
TransferReceiver* recv = receivers_.access(key);
if (recv == NULL)
{
if (!frame.isFirstFrame())
if (!frame.isFirst())
return;
TransferReceiver new_recv;