mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 01:07:51 +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.
19 lines
412 B
C++
19 lines
412 B
C++
#pragma once
|
|
|
|
#include "InputBroker.h"
|
|
#include "OneButton.h"
|
|
#include "concurrency/OSThread.h"
|
|
#include "configuration.h"
|
|
#if defined(M5STACK_UNITC6L)
|
|
|
|
class i2cButtonThread : public Observable<const InputEvent *>, public concurrency::OSThread
|
|
{
|
|
public:
|
|
const char *_originName;
|
|
explicit i2cButtonThread(const char *name);
|
|
int32_t runOnce() override;
|
|
};
|
|
|
|
extern i2cButtonThread *i2cButton;
|
|
#endif
|