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

Renamed clock::setMinJump()

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-24 23:48:25 +04:00
parent 5a01135970
commit f28b00c5db
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/include/uavcan_stm32/clock.hpp
+1 -1
View File
@@ -62,7 +62,7 @@ uavcan::UtcDuration getPrevUtcAdjustment();
* The parameter must be positive. * The parameter must be positive.
* This function is thread safe. * This function is thread safe.
*/ */
void setMinJump(uavcan::UtcDuration adj); void setMinUtcJump(uavcan::UtcDuration adj);
} }
libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
+4 -4
View File
@@ -41,7 +41,7 @@ uavcan::uint32_t utc_jump_cnt = 0;
uavcan::int32_t utc_correction_usec_per_overflow_x16 = 0; uavcan::int32_t utc_correction_usec_per_overflow_x16 = 0;
uavcan::int64_t prev_adjustment = 0; uavcan::int64_t prev_adjustment = 0;
uavcan::UtcDuration min_jump = uavcan::UtcDuration::fromMSec(10); uavcan::UtcDuration min_utc_jump = uavcan::UtcDuration::fromMSec(10);
uavcan::uint64_t time_mono = 0; uavcan::uint64_t time_mono = 0;
uavcan::uint64_t time_utc = 0; uavcan::uint64_t time_utc = 0;
@@ -165,7 +165,7 @@ void adjustUtc(uavcan::UtcDuration adjustment)
* Clock value adjustment * Clock value adjustment
* For small adjustments we will rely only on speed change * For small adjustments we will rely only on speed change
*/ */
if (adjustment.getAbs() > min_jump || !utc_set) if (adjustment.getAbs() > min_utc_jump || !utc_set)
{ {
const uavcan::int64_t adj_usec = adjustment.toUSec(); const uavcan::int64_t adj_usec = adjustment.toUSec();
@@ -211,12 +211,12 @@ uavcan::UtcDuration getPrevUtcAdjustment()
return uavcan::UtcDuration::fromUSec(prev_adjustment); return uavcan::UtcDuration::fromUSec(prev_adjustment);
} }
void setMinJump(uavcan::UtcDuration adj) void setMinUtcJump(uavcan::UtcDuration adj)
{ {
MutexLocker mlocker(mutex); MutexLocker mlocker(mutex);
if (adj.isPositive()) if (adj.isPositive())
{ {
min_jump = adj; min_utc_jump = adj;
} }
else else
{ {