mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-15 16:01:19 +10:00
Jorropo
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.
41 lines
782 B
C++
41 lines
782 B
C++
#include "concurrency/BinarySemaphoreFreeRTOS.h"
|
|
#include "configuration.h"
|
|
#include <assert.h>
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
BinarySemaphoreFreeRTOS::BinarySemaphoreFreeRTOS() : semaphore(xSemaphoreCreateBinary())
|
|
{
|
|
assert(semaphore);
|
|
}
|
|
|
|
BinarySemaphoreFreeRTOS::~BinarySemaphoreFreeRTOS()
|
|
{
|
|
vSemaphoreDelete(semaphore);
|
|
}
|
|
|
|
/**
|
|
* Returns false if we were interrupted
|
|
*/
|
|
bool BinarySemaphoreFreeRTOS::take(uint32_t msec)
|
|
{
|
|
return xSemaphoreTake(semaphore, pdMS_TO_TICKS(msec));
|
|
}
|
|
|
|
void BinarySemaphoreFreeRTOS::give()
|
|
{
|
|
xSemaphoreGive(semaphore);
|
|
}
|
|
|
|
IRAM_ATTR void BinarySemaphoreFreeRTOS::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken)
|
|
{
|
|
xSemaphoreGiveFromISR(semaphore, pxHigherPriorityTaskWoken);
|
|
}
|
|
|
|
} // namespace concurrency
|
|
|
|
#endif
|