Skip to content

Commit e84e306

Browse files
author
Scott Powell
committed
* MomentaryButton: pullupdown param moved to constructor
1 parent c8bbec6 commit e84e306

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/helpers/ui/MomentaryButton.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#include "MomentaryButton.h"
22

3-
MomentaryButton::MomentaryButton(int8_t pin, int long_press_millis, bool reverse) {
3+
MomentaryButton::MomentaryButton(int8_t pin, int long_press_millis, bool reverse, bool pulldownup) {
44
_pin = pin;
55
_reverse = reverse;
6+
_pull = pulldownup;
67
down_at = 0;
78
prev = _reverse ? HIGH : LOW;
89
cancel = 0;
910
_long_millis = long_press_millis;
1011
}
1112

12-
void MomentaryButton::begin(bool pulldownup) {
13+
void MomentaryButton::begin() {
1314
if (_pin >= 0) {
14-
pinMode(_pin, pulldownup ? (_reverse ? INPUT_PULLUP : INPUT_PULLDOWN) : INPUT);
15+
pinMode(_pin, _pull ? (_reverse ? INPUT_PULLUP : INPUT_PULLDOWN) : INPUT);
1516
}
1617
}
1718

src/helpers/ui/MomentaryButton.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
class MomentaryButton {
1010
int8_t _pin;
1111
int8_t prev, cancel;
12-
bool _reverse;
12+
bool _reverse, _pull;
1313
int _long_millis;
1414
unsigned long down_at;
1515

1616
bool isPressed(int level) const;
1717

1818
public:
19-
MomentaryButton(int8_t pin, int long_press_mills=0, bool reverse=false);
20-
void begin(bool pulldownup=false);
19+
MomentaryButton(int8_t pin, int long_press_mills=0, bool reverse=false, bool pulldownup=false);
20+
void begin();
2121
int check(bool repeat_click=false); // returns one of BUTTON_EVENT_*
2222
void cancelClick(); // suppress next BUTTON_EVENT_CLICK (if already in DOWN state)
2323
uint8_t getPin() { return _pin; }

0 commit comments

Comments
 (0)