Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Performed cleanup of Timer's free functions (#776)

Browse Source 
* GetClock() is now officially deprecated since its comment already informally
  did so and the function just forwards to Timer::GetFPGATimestamp().
* The declaration of GetPPCTimestamp() is missing a definition and has been
  removed.
* std::this_thread::sleep_for() returns immediately when given a negative
  duration, so the check for that was removed from Wait().
This commit is contained in:
Tyler Veness
2017-11-27 21:59:00 -08:00
committed by Peter Johnson
parent dfc0656e5c
commit 26a36779a6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/cpp/Notifier.cpp
View File

@@ -103,7 +103,7 @@ void Notifier::StartSingle(double delay) {
std::lock_guard<wpi::mutex> lock(m_processMutex);
m_periodic = false;
m_period = delay;
m_expirationTime = GetClock() + m_period;
m_expirationTime = Timer::GetFPGATimestamp() + m_period;
UpdateAlarm();
}
@@ -121,7 +121,7 @@ void Notifier::StartPeriodic(double period) {
std::lock_guard<wpi::mutex> lock(m_processMutex);
m_periodic = true;
m_period = period;
m_expirationTime = GetClock() + m_period;
m_expirationTime = Timer::GetFPGATimestamp() + m_period;
UpdateAlarm();
}