mirror of
https://github.com/meshtastic/firmware.git
synced 2026-04-07 00:43:18 -04: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.
14 lines
314 B
C++
14 lines
314 B
C++
#pragma once
|
|
#include "UpDownInterruptBase.h"
|
|
|
|
class UpDownInterruptImpl1 : public UpDownInterruptBase
|
|
{
|
|
public:
|
|
UpDownInterruptImpl1();
|
|
bool init();
|
|
static void handleIntDown();
|
|
static void handleIntUp();
|
|
static void handleIntPressed();
|
|
};
|
|
|
|
extern UpDownInterruptImpl1 *upDownInterruptImpl1; |