From dfde8c79ba2ab211604a344731c713882200d490 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Fri, 21 Feb 2020 21:48:06 +0100 Subject: [PATCH] Style sweep --- lib/Button/Button.cpp | 82 +++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/lib/Button/Button.cpp b/lib/Button/Button.cpp index 4e80a56c..27b4494e 100644 --- a/lib/Button/Button.cpp +++ b/lib/Button/Button.cpp @@ -1,81 +1,73 @@ /* - Button - a small library for Arduino to handle button debouncing - - MIT licensed. + Button - a small library for Arduino to handle button debouncing + + + MIT licensed. */ #include "Button.h" #include -Button::Button(uint8_t pin) -: _pin(pin) -, _delay(500) -, _state(HIGH) -, _ignore_until(0) -, _has_changed(false) -{ -} +Button::Button(uint8_t pin) : _pin(pin), _delay(100), _state(HIGH), _ignore_until(0), _has_changed(false) +{} void Button::begin() { - pinMode(_pin, INPUT_PULLUP); + pinMode(_pin, INPUT_PULLUP); } -// +// // public methods -// +// bool Button::read() { - // ignore pin changes until after this delay time - if (_ignore_until > millis()) - { - // ignore any changes during this period - } - - // pin has changed - else if (digitalRead(_pin) != _state) - { - _ignore_until = millis() + _delay; - _state = !_state; - _has_changed = true; - } - - return _state; + // ignore pin changes until after this delay time + if(_ignore_until > millis()) { + // ignore any changes during this period + } + + // pin has changed + else if(digitalRead(_pin) != _state) { + _ignore_until = millis() + _delay; + _state = !_state; + _has_changed = true; + } + + return _state; } // has the button been toggled from on -> off, or vice versa bool Button::toggled() { - read(); - return has_changed(); + read(); + return has_changed(); } // mostly internal, tells you if a button has changed after calling the read() function bool Button::has_changed() { - if (_has_changed == true) - { - _has_changed = false; - return true; - } - return false; + if(_has_changed == true) { + _has_changed = false; + return true; + } + return false; } // has the button gone from off -> on bool Button::pressed() { - if (read() == PRESSED && has_changed() == true) - return true; - else - return false; + if(read() == PRESSED && has_changed() == true) + return true; + else + return false; } // has the button gone from on -> off bool Button::released() { - if (read() == RELEASED && has_changed() == true) - return true; - else - return false; + if(read() == RELEASED && has_changed() == true) + return true; + else + return false; }