Skip to content

Move invariant constants out of class definition #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cleishm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Move invariant constants out of class definition #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7464361
Move invariant constants out of class definition
cleishm Oct 14, 2025
bea5ad4
Prefer nullptr over NULL
cleishm Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/ESP32RotaryEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@
#endif
#endif

static const DRAM_ATTR char *LOG_TAG = "ESP32RotaryEncoder";

typedef enum {
LEFT = -1,
STILL = 0,
RIGHT = 1
} Rotation;

static const Rotation encoderStates[16] = {
STILL, LEFT, RIGHT, STILL,
RIGHT, STILL, STILL, LEFT,
LEFT, STILL, STILL, RIGHT,
STILL, RIGHT, LEFT, STILL
};


RotaryEncoder::RotaryEncoder( uint8_t encoderPinA, uint8_t encoderPinB, int8_t buttonPin, int8_t vccPin, uint8_t encoderSteps )
: encoderPinA{ encoderPinA },
encoderPinB{ encoderPinB },
Expand Down Expand Up @@ -332,10 +348,10 @@ void RotaryEncoder::setEncoderValue( long newValue )

void ARDUINO_ISR_ATTR RotaryEncoder::loop()
{
if( callbackEncoderChanged != NULL && encoderChanged() )
if( callbackEncoderChanged != nullptr && encoderChanged() )
callbackEncoderChanged( getEncoderValue() );

if( callbackButtonPressed != NULL && buttonPressed() )
if( callbackButtonPressed != nullptr && buttonPressed() )
callbackButtonPressed( buttonPressedDuration );
}

Expand Down
19 changes: 2 additions & 17 deletions src/ESP32RotaryEncoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,23 +230,8 @@ class RotaryEncoder {
void loop();

private:
const char *LOG_TAG = "ESP32RotaryEncoder";

EncoderCallback callbackEncoderChanged = NULL;
ButtonCallback callbackButtonPressed = NULL;

typedef enum {
LEFT = -1,
STILL = 0,
RIGHT = 1
} Rotation;

Rotation encoderStates[16] = {
STILL, LEFT, RIGHT, STILL,
RIGHT, STILL, STILL, LEFT,
LEFT, STILL, STILL, RIGHT,
STILL, RIGHT, LEFT, STILL
};
EncoderCallback callbackEncoderChanged = nullptr;
ButtonCallback callbackButtonPressed = nullptr;

int encoderPinMode = INPUT;
int buttonPinMode = INPUT;
Expand Down