Revert "Rename RotaryEncoderImpl to TLoraPagerRotaryEncoder"

This reverts commit a76cc88dc2.
This commit is contained in:
WillyJL
2025-09-21 03:23:16 +02:00
parent a76cc88dc2
commit 4100ba83a3
3 changed files with 15 additions and 15 deletions

View File

@@ -1,19 +1,19 @@
#ifdef T_LORA_PAGER
#include "TLoraPagerRotaryEncoder.h"
#include "RotaryEncoderImpl.h"
#include "InputBroker.h"
#include "RotaryEncoder.h"
#define ORIGIN_NAME "RotaryEncoder"
TLoraPagerRotaryEncoder *tLoraPagerRotaryEncoder;
RotaryEncoderImpl *rotaryEncoderImpl;
TLoraPagerRotaryEncoder::TLoraPagerRotaryEncoder()
RotaryEncoderImpl::RotaryEncoderImpl()
{
rotary = nullptr;
}
bool TLoraPagerRotaryEncoder::init()
bool RotaryEncoderImpl::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 TLoraPagerRotaryEncoder::init()
return true;
}
void TLoraPagerRotaryEncoder::pollOnce()
void RotaryEncoderImpl::pollOnce()
{
InputEvent e{ORIGIN_NAME, INPUT_BROKER_NONE, 0, 0, 0};
@@ -71,6 +71,6 @@ void TLoraPagerRotaryEncoder::pollOnce()
}
}
TLoraPagerRotaryEncoder *TLoraPagerRotaryEncoder::interruptInstance;
RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;
#endif

View File

@@ -10,15 +10,15 @@
class RotaryEncoder;
class TLoraPagerRotaryEncoder : public InputPollable
class RotaryEncoderImpl : public InputPollable
{
public:
TLoraPagerRotaryEncoder();
RotaryEncoderImpl();
bool init(void);
virtual void pollOnce() override;
protected:
static TLoraPagerRotaryEncoder *interruptInstance;
static RotaryEncoderImpl *interruptInstance;
input_broker_event eventCw = INPUT_BROKER_NONE;
input_broker_event eventCcw = INPUT_BROKER_NONE;
@@ -27,6 +27,6 @@ class TLoraPagerRotaryEncoder : public InputPollable
RotaryEncoder *rotary;
};
extern TLoraPagerRotaryEncoder *tLoraPagerRotaryEncoder;
extern RotaryEncoderImpl *rotaryEncoderImpl;
#endif

View File

@@ -4,7 +4,7 @@
#include "input/ExpressLRSFiveWay.h"
#include "input/InputBroker.h"
#ifdef T_LORA_PAGER
#include "input/TLoraPagerRotaryEncoder.h"
#include "input/RotaryEncoderImpl.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
tLoraPagerRotaryEncoder = new TLoraPagerRotaryEncoder();
if (!tLoraPagerRotaryEncoder->init()) {
delete tLoraPagerRotaryEncoder;
tLoraPagerRotaryEncoder = nullptr;
rotaryEncoderImpl = new RotaryEncoderImpl();
if (!rotaryEncoderImpl->init()) {
delete rotaryEncoderImpl;
rotaryEncoderImpl = nullptr;
}
#else
upDownInterruptImpl1 = new UpDownInterruptImpl1();