mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-16 00:21:35 +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
967 B
C++
41 lines
967 B
C++
#pragma once
|
|
|
|
#include "../freertosinc.h"
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
#include "concurrency/BinarySemaphoreFreeRTOS.h"
|
|
#define BinarySemaphore BinarySemaphoreFreeRTOS
|
|
#else
|
|
#include "concurrency/BinarySemaphorePosix.h"
|
|
#define BinarySemaphore BinarySemaphorePosix
|
|
#endif
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
/**
|
|
* An object that provides delay(msec) like functionality, but can be interrupted by calling interrupt().
|
|
*
|
|
* Useful for they top level loop() delay call to keep the CPU powered down until our next scheduled event or some external event.
|
|
*
|
|
* This is implemented for FreeRTOS but should be easy to port to other operating systems.
|
|
*/
|
|
class InterruptableDelay
|
|
{
|
|
BinarySemaphore semaphore;
|
|
|
|
public:
|
|
InterruptableDelay();
|
|
~InterruptableDelay();
|
|
|
|
/**
|
|
* Returns false if we were interrupted
|
|
*/
|
|
bool delay(uint32_t msec);
|
|
|
|
void interrupt();
|
|
|
|
void interruptFromISR(BaseType_t *pxHigherPriorityTaskWoken);
|
|
};
|
|
|
|
} // namespace concurrency
|