mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-28 07:13:25 +00:00
Rename RotaryEncoderImpl to TLoraPagerRotaryEncoder
This commit is contained in:
parent
bfb03b422a
commit
a76cc88dc2
@ -1,19 +1,19 @@
|
||||
#ifdef T_LORA_PAGER
|
||||
|
||||
#include "RotaryEncoderImpl.h"
|
||||
#include "TLoraPagerRotaryEncoder.h"
|
||||
#include "InputBroker.h"
|
||||
#include "RotaryEncoder.h"
|
||||
|
||||
#define ORIGIN_NAME "RotaryEncoder"
|
||||
|
||||
RotaryEncoderImpl *rotaryEncoderImpl;
|
||||
TLoraPagerRotaryEncoder *tLoraPagerRotaryEncoder;
|
||||
|
||||
RotaryEncoderImpl::RotaryEncoderImpl()
|
||||
TLoraPagerRotaryEncoder::TLoraPagerRotaryEncoder()
|
||||
{
|
||||
rotary = nullptr;
|
||||
}
|
||||
|
||||
bool RotaryEncoderImpl::init()
|
||||
bool TLoraPagerRotaryEncoder::init()
|
||||
{
|
||||
if (!moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.inputbroker_pin_a == 0 ||
|
||||
moduleConfig.canned_message.inputbroker_pin_b == 0) {
|
||||
@ -41,7 +41,7 @@ bool RotaryEncoderImpl::init()
|
||||
return true;
|
||||
}
|
||||
|
||||
void RotaryEncoderImpl::pollOnce()
|
||||
void TLoraPagerRotaryEncoder::pollOnce()
|
||||
{
|
||||
InputEvent e{ORIGIN_NAME, INPUT_BROKER_NONE, 0, 0, 0};
|
||||
|
||||
@ -71,6 +71,6 @@ void RotaryEncoderImpl::pollOnce()
|
||||
}
|
||||
}
|
||||
|
||||
RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;
|
||||
TLoraPagerRotaryEncoder *TLoraPagerRotaryEncoder::interruptInstance;
|
||||
|
||||
#endif
|
||||
@ -10,15 +10,15 @@
|
||||
|
||||
class RotaryEncoder;
|
||||
|
||||
class RotaryEncoderImpl : public InputPollable
|
||||
class TLoraPagerRotaryEncoder : public InputPollable
|
||||
{
|
||||
public:
|
||||
RotaryEncoderImpl();
|
||||
TLoraPagerRotaryEncoder();
|
||||
bool init(void);
|
||||
virtual void pollOnce() override;
|
||||
|
||||
protected:
|
||||
static RotaryEncoderImpl *interruptInstance;
|
||||
static TLoraPagerRotaryEncoder *interruptInstance;
|
||||
|
||||
input_broker_event eventCw = INPUT_BROKER_NONE;
|
||||
input_broker_event eventCcw = INPUT_BROKER_NONE;
|
||||
@ -27,6 +27,6 @@ class RotaryEncoderImpl : public InputPollable
|
||||
RotaryEncoder *rotary;
|
||||
};
|
||||
|
||||
extern RotaryEncoderImpl *rotaryEncoderImpl;
|
||||
extern TLoraPagerRotaryEncoder *tLoraPagerRotaryEncoder;
|
||||
|
||||
#endif
|
||||
@ -4,7 +4,7 @@
|
||||
#include "input/ExpressLRSFiveWay.h"
|
||||
#include "input/InputBroker.h"
|
||||
#ifdef T_LORA_PAGER
|
||||
#include "input/RotaryEncoderImpl.h"
|
||||
#include "input/TLoraPagerRotaryEncoder.h"
|
||||
#endif
|
||||
#include "input/RotaryEncoderInterruptImpl1.h"
|
||||
#include "input/SerialKeyboardImpl.h"
|
||||
@ -185,10 +185,10 @@ void setupModules()
|
||||
}
|
||||
#ifdef T_LORA_PAGER
|
||||
// use a special FSM based rotary encoder version for T-LoRa Pager
|
||||
rotaryEncoderImpl = new RotaryEncoderImpl();
|
||||
if (!rotaryEncoderImpl->init()) {
|
||||
delete rotaryEncoderImpl;
|
||||
rotaryEncoderImpl = nullptr;
|
||||
tLoraPagerRotaryEncoder = new TLoraPagerRotaryEncoder();
|
||||
if (!tLoraPagerRotaryEncoder->init()) {
|
||||
delete tLoraPagerRotaryEncoder;
|
||||
tLoraPagerRotaryEncoder = nullptr;
|
||||
}
|
||||
#else
|
||||
upDownInterruptImpl1 = new UpDownInterruptImpl1();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user