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

GlobalTimeSyncSlave typo

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-24 13:25:26 +04:00
parent 9d797e5ac5
commit 56748523fc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
+2 -2
View File
@@ -22,7 +22,7 @@ class GlobalTimeSyncSlave : Noncopyable
UtcTime prev_ts_utc_;
MonotonicTime prev_ts_mono_;
MonotonicTime last_adjustment_ts_;
enum State { Update, Adjust } state;
enum State { Update, Adjust } state_;
NodeID master_nid_;
uint8_t prev_iface_index_;
@@ -39,7 +39,7 @@ class GlobalTimeSyncSlave : Noncopyable
public:
GlobalTimeSyncSlave(INode& node)
: sub_(node)
, state(Update)
, state_(Update)
, prev_iface_index_(0xFF)
{ }
libuavcan/src/protocol/global_time_sync_slave.cpp
+3 -3
View File
@@ -20,7 +20,7 @@ void GlobalTimeSyncSlave::adjustFromMsg(const ReceivedDataStructure<protocol::Gl
getSystemClock().adjustUtc(adjustment);
last_adjustment_ts_ = msg.getMonotonicTimestamp();
state = Update;
state_ = Update;
}
void GlobalTimeSyncSlave::updateFromMsg(const ReceivedDataStructure<protocol::GlobalTimeSync>& msg)
@@ -32,7 +32,7 @@ void GlobalTimeSyncSlave::updateFromMsg(const ReceivedDataStructure<protocol::Gl
prev_ts_mono_ = msg.getMonotonicTimestamp();
master_nid_ = msg.getSrcNodeID();
prev_iface_index_ = msg.getIfaceIndex();
state = Adjust;
state_ = Adjust;
}
void GlobalTimeSyncSlave::processMsg(const ReceivedDataStructure<protocol::GlobalTimeSync>& msg)
@@ -52,7 +52,7 @@ void GlobalTimeSyncSlave::processMsg(const ReceivedDataStructure<protocol::Globa
}
else if (msg.getIfaceIndex() == prev_iface_index_ && msg.getSrcNodeID() == master_nid_)
{
if (state == Adjust && msg.prev_utc_usec > 0)
if (state_ == Adjust && msg.prev_utc_usec > 0)
{
adjustFromMsg(msg);
}