mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-11 20:37:22 +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.
47 lines
1.8 KiB
C++
47 lines
1.8 KiB
C++
#include "RotaryEncoderInterruptImpl1.h"
|
|
#include "InputBroker.h"
|
|
extern bool osk_found;
|
|
|
|
RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
|
|
|
|
RotaryEncoderInterruptImpl1::RotaryEncoderInterruptImpl1() : RotaryEncoderInterruptBase("rotEnc1") {}
|
|
|
|
bool RotaryEncoderInterruptImpl1::init()
|
|
{
|
|
if (!moduleConfig.canned_message.rotary1_enabled) {
|
|
// Input device is disabled.
|
|
disable();
|
|
return false;
|
|
}
|
|
|
|
uint8_t pinA = moduleConfig.canned_message.inputbroker_pin_a;
|
|
uint8_t pinB = moduleConfig.canned_message.inputbroker_pin_b;
|
|
uint8_t pinPress = moduleConfig.canned_message.inputbroker_pin_press;
|
|
input_broker_event eventCw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_cw);
|
|
input_broker_event eventCcw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_ccw);
|
|
input_broker_event eventPressed = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_press);
|
|
input_broker_event eventPressedLong = INPUT_BROKER_SELECT_LONG;
|
|
|
|
// moduleConfig.canned_message.ext_notification_module_output
|
|
RotaryEncoderInterruptBase::init(pinA, pinB, pinPress, eventCw, eventCcw, eventPressed, eventPressedLong,
|
|
RotaryEncoderInterruptImpl1::handleIntA, RotaryEncoderInterruptImpl1::handleIntB,
|
|
RotaryEncoderInterruptImpl1::handleIntPressed);
|
|
inputBroker->registerSource(this);
|
|
#ifndef HAS_PHYSICAL_KEYBOARD
|
|
osk_found = true;
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
void RotaryEncoderInterruptImpl1::handleIntA()
|
|
{
|
|
rotaryEncoderInterruptImpl1->intAHandler();
|
|
}
|
|
void RotaryEncoderInterruptImpl1::handleIntB()
|
|
{
|
|
rotaryEncoderInterruptImpl1->intBHandler();
|
|
}
|
|
void RotaryEncoderInterruptImpl1::handleIntPressed()
|
|
{
|
|
rotaryEncoderInterruptImpl1->intPressHandler();
|
|
} |