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.
91 lines
2.4 KiB
C++
91 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include <cstdlib>
|
|
#include <stdint.h>
|
|
|
|
#include "Thread.h"
|
|
#include "ThreadController.h"
|
|
#include "concurrency/InterruptableDelay.h"
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
extern ThreadController mainController, timerController;
|
|
extern InterruptableDelay mainDelay;
|
|
|
|
#define RUN_SAME -1
|
|
|
|
/**
|
|
* @brief Base threading
|
|
*
|
|
* This is a pseudo threading layer that is super easy to port, well suited to our slow network and very ram & power efficient.
|
|
*
|
|
* TODO FIXME @geeksville
|
|
*
|
|
* move more things into OSThreads
|
|
* remove lock/lockguard
|
|
*
|
|
* move typedQueue into concurrency
|
|
* remove freertos from typedqueue
|
|
*/
|
|
class OSThread : public Thread
|
|
{
|
|
ThreadController *controller;
|
|
|
|
/// Show debugging info for disabled threads
|
|
static bool showDisabled;
|
|
|
|
/// Show debugging info for threads when we run them
|
|
static bool showRun;
|
|
|
|
/// Show debugging info for threads we decide not to run;
|
|
static bool showWaiting;
|
|
|
|
public:
|
|
/// For debug printing only (might be null)
|
|
static const OSThread *currentThread;
|
|
|
|
OSThread(const char *name, uint32_t period = 0, ThreadController *controller = &mainController);
|
|
|
|
virtual ~OSThread();
|
|
|
|
virtual bool shouldRun(unsigned long time);
|
|
|
|
static void setup();
|
|
|
|
virtual int32_t disable();
|
|
|
|
/**
|
|
* Wait a specified number msecs starting from the current time (rather than the last time we were run)
|
|
*/
|
|
void setIntervalFromNow(unsigned long _interval);
|
|
|
|
protected:
|
|
/**
|
|
* The method that will be called each time our thread gets a chance to run
|
|
*
|
|
* Returns desired period for next invocation (or RUN_SAME for no change)
|
|
*/
|
|
virtual int32_t runOnce() = 0;
|
|
bool sleepOnNextExecution = false;
|
|
|
|
// Do not override this
|
|
virtual void run();
|
|
};
|
|
|
|
/**
|
|
* This flag is set **only** when setup() starts, to provide a way for us to check for sloppy static constructor calls.
|
|
* Call assertIsSetup() to force a crash if someone tries to create an instance too early.
|
|
*
|
|
* it is super important to never allocate those object statically. instead, you should explicitly
|
|
* new them at a point where you are guaranteed that other objects that this instance
|
|
* depends on have already been created.
|
|
*
|
|
* in particular, for OSThread that means "all instances must be declared via new() in setup() or later" -
|
|
* this makes it guaranteed that the global mainController is fully constructed first.
|
|
*/
|
|
extern bool hasBeenSetup;
|
|
|
|
void assertIsSetup();
|
|
|
|
} // namespace concurrency
|