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.
24 lines
479 B
C++
24 lines
479 B
C++
#include "TCA8418KeyboardBase.h"
|
|
|
|
/**
|
|
* @brief 3x4 keypad with 3 columns and 4 rows
|
|
*/
|
|
class TCA8418Keyboard : public TCA8418KeyboardBase
|
|
{
|
|
public:
|
|
TCA8418Keyboard();
|
|
void reset(void) override;
|
|
void setBacklight(bool on) override;
|
|
|
|
protected:
|
|
void pressed(uint8_t key) override;
|
|
void released(void) override;
|
|
|
|
int8_t last_key;
|
|
int8_t next_key;
|
|
uint32_t last_tap;
|
|
uint8_t char_idx;
|
|
int32_t tap_interval;
|
|
bool should_backspace;
|
|
};
|