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

Formatted Code To Use Same Style

Browse Source
This commit is contained in:
ElectronicsArchiver
2022-05-25 21:44:07 -04:00
parent 66e8e385ae
commit 0a51c7679a
2 changed files with 109 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Debounce.cpp
+98 -96
View File
@@ -14,134 +14,134 @@ Debouncer::Debouncer():previous_millis(0)
, interval_millis(10)
, state(0) {}
void Debouncer::interval(uint16_t interval_millis)
{
this->interval_millis = interval_millis;
void Debouncer::interval(uint16_t interval_millis){
this -> interval_millis = interval_millis;
}
void Debouncer::begin() {
state = 0;
if (readCurrentState()) {
void Debouncer::begin(){
state = 0;
if(readCurrentState())
setStateFlag(DEBOUNCED_STATE | UNSTABLE_STATE);
}
#ifdef BOUNCE_LOCK_OUT
previous_millis = 0;
#else
previous_millis = millis();
#endif
previous_millis = 0;
#else
previous_millis = millis();
#endif
}
bool Debouncer::update()
{
bool Debouncer::update(){
unsetStateFlag(CHANGED_STATE);
#ifdef BOUNCE_LOCK_OUT
// Ignore everything if we are locked out
if (millis() - previous_millis >= interval_millis) {
bool currentState = readCurrentState();
if ( currentState != getStateFlag(DEBOUNCED_STATE) ) {
previous_millis = millis();
changeState();
#ifdef BOUNCE_LOCK_OUT
// Ignore everything if we are locked out
if (millis() - previous_millis >= interval_millis) {
bool currentState = readCurrentState();
if ( currentState != getStateFlag(DEBOUNCED_STATE) ) {
previous_millis = millis();
changeState();
}
}
}
#elif defined BOUNCE_WITH_PROMPT_DETECTION
#elif defined BOUNCE_WITH_PROMPT_DETECTION
/*
* Switch Port State 🠖 Temporary Variable
*/
/*
* Switch Port State 🠖 Temporary Variable
*/
bool readState = readCurrentState();
bool readState = readCurrentState();
// Check if the button state has changed
// Check if the button state has changed
if ( readState != getStateFlag(DEBOUNCED_STATE) ) {
if(readState != getStateFlag(DEBOUNCED_STATE)){
/*
* Enough time has passed
* ⤷ New state changes are allowed
*
* Set Flags:
* - STATE_CHANGED
* - DEBOUNCED_STATE
*/
if(millis() - previous_millis >= interval_millis){
changeState();
}
}
/*
* Enough time has passed
* ⤷ New state changes are allowed
* If readState ≠ to it's previous state
* ⤷ Reset the debounce timer
*
* Set Flags:
* - STATE_CHANGED
* - DEBOUNCED_STATE
* This is done, as input is still unstable
* and we want to prevent new button state
* changes until the previous state has
* remained stable for the timeout.
*/
if ( millis() - previous_millis >= interval_millis ) {
changeState();
}
}
if(readState != getStateFlag(UNSTABLE_STATE)){
// Update unstable bit to match readState
/*
* If readState ≠ to it's previous state
* ⤷ Reset the debounce timer
*
* This is done, as input is still unstable
* and we want to prevent new button state
* changes until the previous state has
* remained stable for the timeout.
*/
if ( readState != getStateFlag(UNSTABLE_STATE) ) {
// Update unstable bit to match readState
toggleStateFlag(UNSTABLE_STATE);
previous_millis = millis();
}
toggleStateFlag(UNSTABLE_STATE);
previous_millis = millis();
}
#else
#else
/*
* Switch Port State 🠖 Temporary Variable
*/
/*
* Switch Port State 🠖 Temporary Variable
*/
bool currentState = readCurrentState();
bool currentState = readCurrentState();
/*
* If the reading ≠ to it's previous state
* ⤷ Reset the debounce counter
*/
/*
* If the reading ≠ to it's previous state
* ⤷ Reset the debounce counter
*/
if ( currentState != getStateFlag(UNSTABLE_STATE) ) {
previous_millis = millis();
toggleStateFlag(UNSTABLE_STATE);
} else
if ( millis() - previous_millis >= interval_millis ) {
if(currentState != getStateFlag(UNSTABLE_STATE)){
previous_millis = millis();
toggleStateFlag(UNSTABLE_STATE);
} else
if(millis() - previous_millis >= interval_millis){
/*
* We have passed the threshold time
* ⤷ The input is now stable
*
*
* If it is ≠ to it's previous state
* ⤷ Set the STATE_CHANGED flag
*/
if (currentState != getStateFlag(DEBOUNCED_STATE) ) {
if(currentState != getStateFlag(DEBOUNCED_STATE)){
previous_millis = millis();
changeState();
changeState();
}
}
#endif
return changed();
#endif
return changed();
}
// Work In Progress
/*
* Work In Progress
* HELD
@@ -151,32 +151,34 @@ unsigned long Debouncer::previousDuration() const {
return durationOfPreviousState;
}
unsigned long Debouncer::currentDuration() const {
return (millis() - stateChangeLastTime);
return millis() - stateChangeLastTime;
}
inline void Debouncer::changeState() {
inline void Debouncer::changeState(){
toggleStateFlag(DEBOUNCED_STATE);
setStateFlag(CHANGED_STATE) ;
durationOfPreviousState = millis() - stateChangeLastTime;
durationOfPreviousState = millis() - stateChangeLastTime;
stateChangeLastTime = millis();
}
bool Debouncer::read() const
{
return getStateFlag(DEBOUNCED_STATE);
}
bool Debouncer::rose() const
{
return getStateFlag(DEBOUNCED_STATE) && getStateFlag(CHANGED_STATE);
}
bool Debouncer::fell() const
{
return !getStateFlag(DEBOUNCED_STATE) && getStateFlag(CHANGED_STATE);
bool Debouncer::read() const {
return getStateFlag(DEBOUNCED_STATE);
}
bool Debouncer::rose() const {
return getStateFlag(DEBOUNCED_STATE)
&& getStateFlag(CHANGED_STATE);
}
bool Debouncer::fell() const {
return ! getStateFlag(DEBOUNCED_STATE)
&& getStateFlag(CHANGED_STATE);
}