mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-20 00:37:36 +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.
29 lines
663 B
C++
29 lines
663 B
C++
#include "GenericThreadModule.h"
|
|
#include "MeshService.h"
|
|
#include "configuration.h"
|
|
#include <Arduino.h>
|
|
|
|
/*
|
|
Generic Thread Module allows for the execution of custom code at a set interval.
|
|
*/
|
|
GenericThreadModule *genericThreadModule;
|
|
|
|
GenericThreadModule::GenericThreadModule() : concurrency::OSThread("GenericThreadModule") {}
|
|
|
|
int32_t GenericThreadModule::runOnce()
|
|
{
|
|
|
|
bool enabled = true;
|
|
if (!enabled)
|
|
return disable();
|
|
|
|
if (firstTime) {
|
|
// do something the first time we run
|
|
firstTime = 0;
|
|
LOG_INFO("first time GenericThread running");
|
|
}
|
|
|
|
LOG_INFO("GenericThread executing");
|
|
return (my_interval);
|
|
}
|