From 1e6b2675b72b7c0408821fac8502952cd63d16f1 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 8 Mar 2024 00:32:42 +0200
Subject: [PATCH] Use int pin_mode instead of bool pullupActive.

explicit OneButton(const int pin, const boolean activeLow = true, const int pin_mode = INPUT_PULLUP);

[[deprecated("Use OneButton(int pin, boolean activeLow, int pin_mode) instead.")]]
OneButton(const int pin, const boolean activeLow, const bool pullupActive); // deprecated

For example:
#if defined(BUTTONS_PULLUP)
userButton = new OneButton(aPIN);
// it is equivalent to
userButton = new OneButton(aPIN, true, INPUT_PULLUP);
#elif defined(BUTTONS_PULLDOWN)
userButton = new OneButton(aPIN, false, INPUT_PULLDOWN);
#elif defined(BUTTONS_HIGH_IMPEDANCE)
userButton = new OneButton(aPIN, true, INPUT);
#endif
---
 src/OneButton.cpp | 22 ++++++++++++++++++++--
 src/OneButton.h   | 13 +++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/OneButton.cpp b/src/OneButton.cpp
index 68e8e84..ce4ac3f 100644
--- a/src/OneButton.cpp
+++ b/src/OneButton.cpp
@@ -29,12 +29,30 @@ OneButton::OneButton()
   // further initialization has moved to OneButton.h
 }
 
+OneButton::OneButton(const int pin, const boolean activeLow, const int pin_mode)
+{
+  _pin = pin;
+
+  if (activeLow) {
+    // the button connects the input pin to GND when pressed.
+    _buttonPressed = LOW;
+
+  } else {
+    // the button connects the input pin to VCC when pressed.
+    _buttonPressed = HIGH;
+  }
+
+  // use the given pin in input mode aka INPUT, INPUT_PULLUP, INPUT_PULLDOWN according to the Arduino board.
+  pinMode(pin, pin_mode);
+} // OneButton
+
 /**
  * Initialize the OneButton library.
  * @param pin The pin to be used for input from a momentary button.
  * @param activeLow Set to true when the input level is LOW when the button is pressed, Default is true.
  * @param pullupActive Activate the internal pullup when available. Default is true.
  */
+/*
 OneButton::OneButton(const int pin, const boolean activeLow, const bool pullupActive)
 {
   _pin = pin;
@@ -56,7 +74,7 @@ OneButton::OneButton(const int pin, const boolean activeLow, const bool pullupAc
     pinMode(pin, INPUT);
   }
 } // OneButton
-
+*/
 
 // explicitly set the number of millisec that have to pass by before a click is assumed stable.
 void OneButton::setDebounceMs(const unsigned int ms)
@@ -261,7 +279,7 @@ void OneButton::_fsm(bool activeLevel)
         _idleState = true;
         _idleFunc();
       }
-      
+
     // waiting for level to become active.
     if (activeLevel) {
       _newState(OneButton::OCS_DOWN);
diff --git a/src/OneButton.h b/src/OneButton.h
index 30d540e..88ef786 100644
--- a/src/OneButton.h
+++ b/src/OneButton.h
@@ -42,12 +42,21 @@ class OneButton
   OneButton();
 
   /**
-   * Initialize the OneButton library.
+   * Initialize the OneButton object.
+   * @param pin The pin to be used for input from a momentary button.
+   * @param activeLow Set to true when the input level is LOW when the button is pressed, Default is true.
+   * @param pin_mode The pinMode() function parameter. INPUT, INPUT_PULLUP, INPUT_PULLDOWN etc. Default is INPUT_PULLUP.
+   */
+  explicit OneButton(const int pin, const boolean activeLow = true, const int pin_mode = INPUT_PULLUP);
+
+  /**
+   * Initialize the OneButton library. [deprecated]
    * @param pin The pin to be used for input from a momentary button.
    * @param activeLow Set to true when the input level is LOW when the button is pressed, Default is true.
    * @param pullupActive Activate the internal pullup when available. Default is true.
    */
-  explicit OneButton(const int pin, const boolean activeLow = true, const bool pullupActive = true);
+  [[deprecated("Use OneButton(int pin, boolean activeLow, int pin_mode) instead.")]]
+  /*explicit */OneButton(const int pin, const boolean activeLow/* = true*/, const bool pullupActive/* = true*/); // deprecated
 
   // ----- Set runtime parameters -----