mirror of
https://github.com/meshtastic/firmware.git
synced 2026-05-30 19:55:48 -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.
21 lines
420 B
C++
21 lines
420 B
C++
#include "SerialKeyboardImpl.h"
|
|
#include "InputBroker.h"
|
|
#include "configuration.h"
|
|
|
|
#ifdef INPUTBROKER_SERIAL_TYPE
|
|
|
|
SerialKeyboardImpl *aSerialKeyboardImpl;
|
|
|
|
SerialKeyboardImpl::SerialKeyboardImpl() : SerialKeyboard("serialKB") {}
|
|
|
|
void SerialKeyboardImpl::init()
|
|
{
|
|
if (!INPUTBROKER_SERIAL_TYPE) {
|
|
disable();
|
|
return;
|
|
}
|
|
|
|
inputBroker->registerSource(this);
|
|
}
|
|
|
|
#endif // INPUTBROKER_SERIAL_TYPE
|