mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-16 23:07:34 +00:00
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.
30 lines
431 B
C++
30 lines
431 B
C++
#pragma once
|
|
|
|
#include "../freertosinc.h"
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
|
|
class BinarySemaphoreFreeRTOS
|
|
{
|
|
SemaphoreHandle_t semaphore;
|
|
|
|
public:
|
|
BinarySemaphoreFreeRTOS();
|
|
~BinarySemaphoreFreeRTOS();
|
|
|
|
/**
|
|
* Returns false if we timed out
|
|
*/
|
|
bool take(uint32_t msec);
|
|
|
|
void give();
|
|
|
|
void giveFromISR(BaseType_t *pxHigherPriorityTaskWoken);
|
|
};
|
|
|
|
#endif
|
|
|
|
} // namespace concurrency
|