Browse Source

* MomentaryButton: pullupdown param moved to constructor

pull/615/head
Scott Powell 10 months ago
parent
commit
e84e3066ff
  1. 7
      src/helpers/ui/MomentaryButton.cpp
  2. 6
      src/helpers/ui/MomentaryButton.h

7
src/helpers/ui/MomentaryButton.cpp

@ -1,17 +1,18 @@
#include "MomentaryButton.h"
MomentaryButton::MomentaryButton(int8_t pin, int long_press_millis, bool reverse) {
MomentaryButton::MomentaryButton(int8_t pin, int long_press_millis, bool reverse, bool pulldownup) {
_pin = pin;
_reverse = reverse;
_pull = pulldownup;
down_at = 0;
prev = _reverse ? HIGH : LOW;
cancel = 0;
_long_millis = long_press_millis;
}
void MomentaryButton::begin(bool pulldownup) {
void MomentaryButton::begin() {
if (_pin >= 0) {
pinMode(_pin, pulldownup ? (_reverse ? INPUT_PULLUP : INPUT_PULLDOWN) : INPUT);
pinMode(_pin, _pull ? (_reverse ? INPUT_PULLUP : INPUT_PULLDOWN) : INPUT);
}
}

6
src/helpers/ui/MomentaryButton.h

@ -9,15 +9,15 @@
class MomentaryButton {
int8_t _pin;
int8_t prev, cancel;
bool _reverse;
bool _reverse, _pull;
int _long_millis;
unsigned long down_at;
bool isPressed(int level) const;
public:
MomentaryButton(int8_t pin, int long_press_mills=0, bool reverse=false);
void begin(bool pulldownup=false);
MomentaryButton(int8_t pin, int long_press_mills=0, bool reverse=false, bool pulldownup=false);
void begin();
int check(bool repeat_click=false); // returns one of BUTTON_EVENT_*
void cancelClick(); // suppress next BUTTON_EVENT_CLICK (if already in DOWN state)
uint8_t getPin() { return _pin; }

Loading…
Cancel
Save