Max/thomasfredericks_Bounce2
1
0
Fork 0
Code Issues 5 Pull Requests 4 Actions Packages Projects Releases 17 Wiki Activity

Abstracted State Checking

Browse Source
This commit is contained in:
ElectronicsArchiver
2022-05-25 22:12:33 -04:00
parent 537be6a0a5
commit 5b0eea1f2d
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Bounce2.h
+4 -2
View File
@@ -74,8 +74,10 @@ private:
inline void unsetStateFlag(const uint8_t flag) {state &= ~flag;}
inline void toggleStateFlag(const uint8_t flag) {state ^= flag;}
inline bool getStateFlag(const uint8_t flag) const {return((state & flag) != 0);}
inline bool thresholdPassed();
inline void updateTime();
inline bool thresholdPassed() const;
inline void updateTime() const;
inline bool isDebouncing(const bool state) const;
inline bool isUnstable(const bool state) const;
public:
/*!
src/Debounce.cpp
+16 -8
View File
@@ -45,9 +45,9 @@ bool Debouncer::update(){
if(thresholdPassed()){
bool currentState = readCurrentState();
const bool state = readCurrentState();
if(currentState != getStateFlag(DEBOUNCED_STATE)){
if(!isDebouncing(state)){
updateTime();
changeState();
}
@@ -74,7 +74,7 @@ bool Debouncer::update(){
// Check if the button state has changed
if(state != getStateFlag(DEBOUNCED_STATE)){
if(!isDebouncing(state)){
/*
* Enough time has passed
@@ -100,7 +100,7 @@ bool Debouncer::update(){
* remained stable for the timeout.
*/
if(state != getStateFlag(UNSTABLE_STATE)){
if(!isUnstable(state)){
// Update unstable bit to match readState
@@ -132,7 +132,7 @@ bool Debouncer::update(){
* ⤷ Reset the debounce counter
*/
if(state != getStateFlag(UNSTABLE_STATE)){
if(!isUnstable(state)){
updateTime();
toggleStateFlag(UNSTABLE_STATE);
@@ -150,7 +150,7 @@ bool Debouncer::update(){
* ⤷ Set the STATE_CHANGED flag
*/
if(state != getStateFlag(DEBOUNCED_STATE)){
if(!isDebouncing(state)){
updateTime();
changeState();
}
@@ -206,10 +206,18 @@ bool Debouncer::fell() const {
}
inline bool Debouncer::thresholdPassed(){
inline bool Debouncer::thresholdPassed() const {
return millis() - previous_millis >= interval_millis;
}
inline void Debouncer::updateTime(){
inline void Debouncer::updateTime() const {
previous_millis = millis();
}
inline bool Debouncer::isDebouncing(const bool state) const {
return state == getStateFlag(DEBOUNCED_STATE);
}
inline bool Debouncer::isUnstable(const bool state) const {
return state == getStateFlag(UNSTABLE_STATE);
}