JorropoandGitHub
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.
18 lines
428 B
C++
18 lines
428 B
C++
#pragma once
|
|
#include "TouchScreenBase.h"
|
|
|
|
class TouchScreenImpl1 : public TouchScreenBase
|
|
{
|
|
public:
|
|
TouchScreenImpl1(uint16_t width, uint16_t height, bool (*getTouch)(int16_t *, int16_t *));
|
|
void init(void);
|
|
|
|
protected:
|
|
virtual bool getTouch(int16_t &x, int16_t &y);
|
|
virtual void onEvent(const TouchEvent &event);
|
|
|
|
bool (*_getTouch)(int16_t *, int16_t *);
|
|
};
|
|
|
|
extern TouchScreenImpl1 *touchScreenImpl1;
|