mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-15 14:27:19 +00: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.
49 lines
1.7 KiB
C++
49 lines
1.7 KiB
C++
#include "UpDownInterruptImpl1.h"
|
|
#include "InputBroker.h"
|
|
extern bool osk_found;
|
|
|
|
UpDownInterruptImpl1 *upDownInterruptImpl1;
|
|
|
|
UpDownInterruptImpl1::UpDownInterruptImpl1() : UpDownInterruptBase("upDown1") {}
|
|
|
|
bool UpDownInterruptImpl1::init()
|
|
{
|
|
|
|
if (!moduleConfig.canned_message.updown1_enabled) {
|
|
// Input device is disabled.
|
|
return false;
|
|
}
|
|
|
|
uint8_t pinUp = moduleConfig.canned_message.inputbroker_pin_a;
|
|
uint8_t pinDown = moduleConfig.canned_message.inputbroker_pin_b;
|
|
uint8_t pinPress = moduleConfig.canned_message.inputbroker_pin_press;
|
|
|
|
input_broker_event eventDown = INPUT_BROKER_USER_PRESS; // acts like RIGHT/DOWN
|
|
input_broker_event eventUp = INPUT_BROKER_ALT_PRESS; // acts like LEFT/UP
|
|
input_broker_event eventPressed = INPUT_BROKER_SELECT;
|
|
input_broker_event eventPressedLong = INPUT_BROKER_SELECT_LONG;
|
|
input_broker_event eventUpLong = INPUT_BROKER_UP_LONG;
|
|
input_broker_event eventDownLong = INPUT_BROKER_DOWN_LONG;
|
|
|
|
UpDownInterruptBase::init(pinDown, pinUp, pinPress, eventDown, eventUp, eventPressed, eventPressedLong, eventUpLong,
|
|
eventDownLong, UpDownInterruptImpl1::handleIntDown, UpDownInterruptImpl1::handleIntUp,
|
|
UpDownInterruptImpl1::handleIntPressed);
|
|
inputBroker->registerSource(this);
|
|
#ifndef HAS_PHYSICAL_KEYBOARD
|
|
osk_found = true;
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
void UpDownInterruptImpl1::handleIntDown()
|
|
{
|
|
upDownInterruptImpl1->intDownHandler();
|
|
}
|
|
void UpDownInterruptImpl1::handleIntUp()
|
|
{
|
|
upDownInterruptImpl1->intUpHandler();
|
|
}
|
|
void UpDownInterruptImpl1::handleIntPressed()
|
|
{
|
|
upDownInterruptImpl1->intPressHandler();
|
|
} |