rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-29 21:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Jm Casler
2020-10-11 21:19:22 -07:00
parent 58cfd1317c
commit 10008d4eef
8 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/concurrency/InterruptableDelay.cpp
View File

@@ -4,30 +4,22 @@
namespace concurrency
{
InterruptableDelay::InterruptableDelay()
{
}
InterruptableDelay::InterruptableDelay() {}
InterruptableDelay::~InterruptableDelay()
{
}
InterruptableDelay::~InterruptableDelay() {}
/**
* Returns false if we were interrupted
*/
bool InterruptableDelay::delay(uint32_t msec)
{
if (msec) {
// DEBUG_MSG("delay %u ", msec);
// DEBUG_MSG("delay %u ", msec);
// sem take will return false if we timed out (i.e. were not interrupted)
bool r = semaphore.take(msec);
// sem take will return false if we timed out (i.e. were not interrupted)
bool r = semaphore.take(msec);
// DEBUG_MSG("interrupt=%d\n", r);
return !r;
} else {
return true;
}
// DEBUG_MSG("interrupt=%d\n", r);
return !r;
}
void InterruptableDelay::interrupt()