mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-27 04:02:05 +00:00
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.
17 lines
483 B
C++
17 lines
483 B
C++
#pragma once
|
|
#include "TrackballInterruptBase.h"
|
|
|
|
class TrackballInterruptImpl1 : public TrackballInterruptBase
|
|
{
|
|
public:
|
|
TrackballInterruptImpl1();
|
|
void init(uint8_t pinDown, uint8_t pinUp, uint8_t pinLeft, uint8_t pinRight, uint8_t pinPress);
|
|
static void handleIntDown();
|
|
static void handleIntUp();
|
|
static void handleIntLeft();
|
|
static void handleIntRight();
|
|
static void handleIntPressed();
|
|
};
|
|
|
|
extern TrackballInterruptImpl1 *trackballInterruptImpl1;
|