Move constants and types into class scope

Move constants and types into class scope. Also move mux into private scope.

This is an API breaking change. Resolves #20.

Author: cleishm

examples/BasicRotaryEncoder/BasicRotaryEncoder.ino

@@ -1,13 +1,13 @@
 /**
  * ESP32RotaryEncoder: BasicRotaryEncoder.ino
- * 
+ *
  * This is a basic example of how to instantiate a single Rotary Encoder.
- * 
+ *
  * Turning the knob will increment/decrement a value between 1 and 10 and
  * print it to the serial console.
- * 
+ *
  * Pressing the button will output "boop!" to the serial console.
- * 
+ *
  * Created 3 October 2023
  * Updated 1 November 2023
  * By Matthew Clark
@@ -42,7 +42,7 @@ void setup()
 	Serial.begin( 115200 );
 
 	// This tells the library that the encoder has its own pull-up resistors
-	rotaryEncoder.setEncoderType( EncoderType::HAS_PULLUP );
+	rotaryEncoder.setEncoderType( RotaryEncoder::Type::HAS_PULLUP );
 
 	// Range of values to be returned by the encoder: minimum is 1, maximum is 10
 	// The third argument specifies whether turning past the minimum/maximum will

examples/ButtonPressDuration/ButtonPressDuration.ino

@@ -1,14 +1,14 @@
 /**
  * ESP32RotaryEncoder: ButtonPressDuration.ino
- * 
+ *
  * This example shows how to handle long button-presses differently
  * from long button-presses
- * 
+ *
  * Turning the knob will increment/decrement a value between 1 and 10 and
  * print it to the serial console.
- * 
+ *
  * Pressing the button will output "boop!" to the serial console.
- * 
+ *
  * Created 1 November 2023
  * By Matthew Clark
  */
@@ -63,7 +63,7 @@ void setup()
 	Serial.begin( 115200 );
 
 	// This tells the library that the encoder has its own pull-up resistors
-	rotaryEncoder.setEncoderType( EncoderType::HAS_PULLUP );
+	rotaryEncoder.setEncoderType( RotaryEncoder::Type::HAS_PULLUP );
 
 	// Range of values to be returned by the encoder: minimum is 1, maximum is 10
 	// The third argument specifies whether turning past the minimum/maximum will

examples/LeftOrRight/LeftOrRight.ino

@@ -1,9 +1,9 @@
 /**
  * ESP32RotaryEncoder: LeftOrRight.ino
- * 
+ *
  * This is a simple example of how to track whether the knob was
  * turned left or right instead of tracking a numeric value
- * 
+ *
  * Created 1 November 2023
  * By Matthew Clark
  */
@@ -83,7 +83,7 @@ void setup()
 	Serial.begin( 115200 );
 
 	// This tells the library that the encoder has its own pull-up resistors
-	rotaryEncoder.setEncoderType( EncoderType::HAS_PULLUP );
+	rotaryEncoder.setEncoderType( RotaryEncoder::Type::HAS_PULLUP );
 
 	// The encoder will only return -1, 0, or 1, and will not wrap around.
 	rotaryEncoder.setBoundaries( -1, 1, false );

examples/TwoRotaryEncoders/TwoRotaryEncoders.ino

@@ -1,23 +1,23 @@
 /**
  * ESP32RotaryEncoder: TwoRotaryEncoders.ino
- * 
+ *
  * This is a basic example of how to instantiate two distinct Rotary Encoders.
- * 
+ *
  * Rotary Encoder #1:
  *   - Turning the knob will increment/decrement a value between 1 and 10,
  *   and print it to the serial console.
- * 
+ *
  * 	 - Pressing the button will enable/disable Rotary Encoder #2.
- * 
+ *
  * Rotary Encoder #2:
  *   - Turning the knob will increment/decrement a value between -100 and 100,
  *   and print it to the serial console.
- * 
+ *
  * 	 - Pressing the button will enable/disable Rotary Encoder #1.
- * 
+ *
  * While a rotary encoder is disabled, turning the knob or pressing the button
  * will have no effect.
- * 
+ *
  * Created 3 October 2023
  * Updated 1 November 2023
  * By Matthew Clark
@@ -82,7 +82,7 @@ void button2ToggleRE1( unsigned long duration )
 void setup_RE1()
 {
 	// This tells the library that the encoder has its own pull-up resistors
-	rotaryEncoder1.setEncoderType( EncoderType::HAS_PULLUP );
+	rotaryEncoder1.setEncoderType( RotaryEncoder::Type::HAS_PULLUP );
 
 	// Range of values to be returned by the encoder: minimum is 1, maximum is 10
 	// The third argument specifies whether turning past the minimum/maximum will
@@ -106,7 +106,7 @@ void setup_RE2()
 {
 	// This tells the library that the encoder does not have its own pull-up
 	// resistors, so the internal pull-up resistors will be enabled
-	rotaryEncoder2.setEncoderType( EncoderType::FLOATING );
+	rotaryEncoder2.setEncoderType( RotaryEncoder::Type::FLOATING );
 
 	// Range of values to be returned by the encoder: minimum is -100, maximum is 100
 	// The third argument specifies whether turning past the minimum/maximum will wrap

src/ESP32RotaryEncoder.cpp

@@ -39,7 +39,7 @@ RotaryEncoder::~RotaryEncoder()
   esp_timer_delete( loopTimer );
 }
 
-void RotaryEncoder::setEncoderType( EncoderType type )
+void RotaryEncoder::setEncoderType( Type type )
 {
   switch( type )
   {
@@ -127,12 +127,6 @@ void RotaryEncoder::onPressed( ButtonCallback f )
   callbackButtonPressed = f;
 }
 
-static void timerCallback( void *arg )
-{
-  RotaryEncoder *instance = (RotaryEncoder *)arg;
-  instance->loop();
-}
-
 void RotaryEncoder::beginLoopTimer()
 {
   /**
@@ -159,6 +153,12 @@ void RotaryEncoder::beginLoopTimer()
   esp_timer_start_periodic( loopTimer, RE_LOOP_INTERVAL );
 }
 
+void RotaryEncoder::timerCallback( void *self )
+{
+  RotaryEncoder *instance = (RotaryEncoder *)self;
+  instance->loop();
+}
+
 void RotaryEncoder::attachInterrupts()
 {
   #if defined( BOARD_HAS_PIN_REMAP ) && ( ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3,0,0) )
@@ -332,10 +332,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 );
 }
 

src/ESP32RotaryEncoder.h

@@ -15,20 +15,17 @@
 
 #include <atomic>
 
-static constexpr int8_t RE_DEFAULT_PIN = -1;
-static constexpr uint8_t RE_DEFAULT_STEPS = 4;
-static constexpr uint64_t RE_LOOP_INTERVAL = 100000U;  // 0.1 seconds
-
-typedef enum {
-  FLOATING,
-  HAS_PULLUP,
-  SW_FLOAT
-} EncoderType;
-
 class RotaryEncoder {
+  public:
+    static constexpr int8_t RE_DEFAULT_PIN = -1;
+    static constexpr uint8_t RE_DEFAULT_STEPS = 4;
+    static constexpr uint64_t RE_LOOP_INTERVAL = 100000U;  // 0.1 seconds
 
-  protected:
-    mutable portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;
+    typedef enum {
+      FLOATING,
+      HAS_PULLUP,
+      SW_FLOAT
+    } Type;
 
     #if defined( ESP32 )
       typedef std::function<void(long)> EncoderCallback;
@@ -38,9 +35,6 @@ class RotaryEncoder {
       typedef void (*ButtonCallback)(unsigned long);
     #endif
 
-
-  public:
-
     /**
      * @brief Construct a new Rotary Encoder instance
      *
@@ -60,7 +54,6 @@ class RotaryEncoder {
 
     /**
      * @brief Responsible for detaching interrupts and clearing the loop timer
-     *
      */
     ~RotaryEncoder();
 
@@ -73,7 +66,7 @@ class RotaryEncoder {
      *              HAS_PULLUP if your encoder is a module that has pull-up resistors, (internal pull-ups will not be used);
      *              SW_FLOAT your encoder is a module that has pull-up resistors, but the resistor for the switch is missing (internal pull-up will be used for switch input only)
      */
-    void setEncoderType( EncoderType type );
+    void setEncoderType( Type type );
 
     /**
      * @brief Set the minimum and maximum values that the encoder will return.
@@ -147,21 +140,18 @@ class RotaryEncoder {
      * @brief Sets up the GPIO pins specified in the constructor and attaches the ISR callback for the encoder.
      *
      * @note Call this in `setup()` after other "set" methods.
-     *
      */
     void begin( bool useTimer = true );
 
     /**
      * @brief Enables the encoder knob and pushbutton if `disable()` was previously used.
-     *
      */
     void enable();
 
     /**
      * @brief Disables the encoder knob and pushbutton.
      *
      * Knob rotation and button presses will have no effect until after `enable()` is called
-     *
      */
     void disable();
 
@@ -214,26 +204,16 @@ class RotaryEncoder {
      * @note This will try to set the value to 0, but if the minimum and maximum configured
      * by `setBoundaries()` does not include 0, then the minimum or maximum will be
      * used instead
-     *
      */
     void resetEncoderValue() { setEncoderValue( 0 ); }
 
-    /**
-     * @brief Synchronizes the encoder value and button state from ISRs.
-     *
-     * Runs on a timer and calls `encoderChanged()` and `buttonPressed()` to determine
-     * if user-specified callbacks should be run.
-     *
-     * This would normally be called in userspace `loop()`, but we're using the `loopTimer` instead.
-     *
-     */
-    void loop();
-
   private:
     const char *LOG_TAG = "ESP32RotaryEncoder";
 
-    EncoderCallback callbackEncoderChanged = NULL;
-    ButtonCallback callbackButtonPressed = NULL;
+    mutable portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;
+
+    EncoderCallback callbackEncoderChanged = nullptr;
+    ButtonCallback callbackButtonPressed = nullptr;
 
     typedef enum {
         LEFT  = -1,
@@ -279,6 +259,8 @@ class RotaryEncoder {
 
     esp_timer_handle_t loopTimer;
     void beginLoopTimer();
+    static void timerCallback( void *self );
+    void loop();
 
     void attachInterrupts();
     void detachInterrupts();