mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-28 04:31:58 +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.
22 lines
437 B
C++
22 lines
437 B
C++
#pragma once
|
|
|
|
#include "MeshModule.h"
|
|
#include "concurrency/OSThread.h"
|
|
#include "configuration.h"
|
|
#include <Arduino.h>
|
|
#include <functional>
|
|
|
|
class GenericThreadModule : private concurrency::OSThread
|
|
{
|
|
bool firstTime = 1;
|
|
|
|
public:
|
|
GenericThreadModule();
|
|
|
|
protected:
|
|
unsigned int my_interval = 10000; // interval in millisconds
|
|
virtual int32_t runOnce() override;
|
|
};
|
|
|
|
extern GenericThreadModule *genericThreadModule;
|