JorropoandGitHub
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
35 lines
731 B
C++
35 lines
731 B
C++
#include "concurrency/InterruptableDelay.h"
|
|
#include "configuration.h"
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
InterruptableDelay::InterruptableDelay() {}
|
|
|
|
InterruptableDelay::~InterruptableDelay() {}
|
|
|
|
/**
|
|
* Returns false if we were interrupted
|
|
*/
|
|
bool InterruptableDelay::delay(uint32_t msec)
|
|
{
|
|
// LOG_DEBUG("delay %u ", msec);
|
|
|
|
// sem take will return false if we timed out (i.e. were not interrupted)
|
|
bool r = semaphore.take(msec);
|
|
|
|
// LOG_DEBUG("interrupt=%d", r);
|
|
return !r;
|
|
}
|
|
|
|
void InterruptableDelay::interrupt()
|
|
{
|
|
semaphore.give();
|
|
}
|
|
|
|
IRAM_ATTR void InterruptableDelay::interruptFromISR(BaseType_t *pxHigherPriorityTaskWoken)
|
|
{
|
|
semaphore.giveFromISR(pxHigherPriorityTaskWoken);
|
|
}
|
|
|
|
} // namespace concurrency
|