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

Notifier: properly reset HAL alarm in non-periodic case (#1296)

Browse Source 
The loop spins otherwise.
This commit is contained in:
Peter Johnson
2018-09-03 16:07:23 -07:00
committed by GitHub
parent 0b113ad9ce
commit 67b1c85315
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,9 @@ Notifier::Notifier(TimerEventHandler handler) {
if (m_periodic) {
m_expirationTime += m_period;
UpdateAlarm();
} else {
// need to update the alarm to cause it to wait again
UpdateAlarm(UINT64_MAX);
}
}
@@ -87,12 +90,15 @@ void Notifier::Stop() {
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
void Notifier::UpdateAlarm() {
void Notifier::UpdateAlarm(uint64_t triggerTime) {
int32_t status = 0;
// Return if we are being destructed, or were not created successfully
auto notifier = m_notifier.load();
if (notifier == 0) return;
HAL_UpdateNotifierAlarm(
notifier, static_cast<uint64_t>(m_expirationTime * 1e6), &status);
HAL_UpdateNotifierAlarm(notifier, triggerTime, &status);
wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
}
void Notifier::UpdateAlarm() {
UpdateAlarm(static_cast<uint64_t>(m_expirationTime * 1e6));
}