mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 09:17:29 +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.
31 lines
697 B
C++
31 lines
697 B
C++
#pragma once
|
|
|
|
#include "TypedQueue.h"
|
|
|
|
/**
|
|
* A wrapper for freertos queues that assumes each element is a pointer
|
|
*/
|
|
template <class T> class PointerQueue : public TypedQueue<T *>
|
|
{
|
|
public:
|
|
explicit PointerQueue(int maxElements) : TypedQueue<T *>(maxElements) {}
|
|
|
|
// returns a ptr or null if the queue was empty
|
|
T *dequeuePtr(TickType_t maxWait = portMAX_DELAY)
|
|
{
|
|
T *p;
|
|
|
|
return this->dequeue(&p, maxWait) ? p : nullptr;
|
|
}
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
// returns a ptr or null if the queue was empty
|
|
T *dequeuePtrFromISR(BaseType_t *higherPriWoken)
|
|
{
|
|
T *p;
|
|
|
|
return this->dequeueFromISR(&p, higherPriWoken) ? p : nullptr;
|
|
}
|
|
#endif
|
|
};
|