Skip to content

Update clickButton.cpp #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexgrauer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update clickButton.cpp #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 55 additions & 6 deletions firmware/clickButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

A positive number denotes the number of (short) clicks after a released button
A negative number denotes the number of "long" clicks
A positive number (100 + number of clicks) denotes that the button was released

NOTE!
This is the OPPOSITE/negative of click codes from the last pre-2013 versions!
Expand Down Expand Up @@ -49,15 +50,18 @@ NOTE!
2010.06.15 - First version. Basically just a small OOP programming exercise.
*/

#include "clickButton.h"
#include "clicklibrary2.h"

ClickButton::ClickButton(uint8_t buttonPin)
{
_pin = buttonPin;
_activeHigh = LOW; // Assume active-low button
_reportRelease = false;
_btnState = !_activeHigh; // initial button state in active-high logic
_lastState = _btnState;
_clickNHold = false;
_clickCount = 0;
_lastClickCount = 0;
clicks = 0;
depressed = false;
_lastBounceTime= 0;
Expand All @@ -67,14 +71,16 @@ ClickButton::ClickButton(uint8_t buttonPin)
pinMode(_pin, INPUT);
}


ClickButton::ClickButton(uint8_t buttonPin, boolean activeType)
{
_pin = buttonPin;
_activeHigh = activeType;
_reportRelease = false;
_btnState = !_activeHigh; // initial button state in active-high logic
_lastState = _btnState;
_clickNHold = false;
_clickCount = 0;
_lastClickCount = 0;
clicks = 0;
depressed = 0;
_lastBounceTime= 0;
Expand All @@ -88,9 +94,37 @@ ClickButton::ClickButton(uint8_t buttonPin, boolean activeType, boolean internal
{
_pin = buttonPin;
_activeHigh = activeType;
_reportRelease = false;
_btnState = !_activeHigh; // initial button state in active-high logic
_lastState = _btnState;
_clickNHold = false;
_clickCount = 0;
_lastClickCount = 0;
clicks = 0;
depressed = 0;
_lastBounceTime= 0;
debounceTime = 20; // Debounce timer in ms
multiclickTime = 250; // Time limit for multi clicks
longClickTime = 1000; // time until "long" click register

// Turn on internal pullup resistor if applicable
if (_activeHigh == LOW && internalPullup == CLICKBTN_PULLUP)
pinMode(_pin, INPUT_PULLUP);
else
pinMode(_pin, INPUT_PULLDOWN);
}


ClickButton::ClickButton(uint8_t buttonPin, boolean activeType, boolean internalPullup, boolean reportRelease)
{
_pin = buttonPin;
_activeHigh = activeType;
_reportRelease = reportRelease;
_btnState = !_activeHigh; // initial button state in active-high logic
_lastState = _btnState;
_clickNHold = false;
_clickCount = 0;
_lastClickCount = 0;
clicks = 0;
depressed = 0;
_lastBounceTime= 0;
Expand Down Expand Up @@ -129,16 +163,31 @@ void ClickButton::Update()
// If the button released state is stable, report nr of clicks and start new cycle
if (!depressed && (now - _lastBounceTime) > multiclickTime)
{
// positive count for released buttons
clicks = _clickCount;
_clickCount = 0;

if (_clickNHold){
clicks = 100 + _lastClickCount;
_clickCount = 0;
_lastClickCount = 0;
_clickNHold = false;
}
else{
// positive count for released buttons
clicks = _clickCount;
_clickCount = 0;
_lastClickCount = 0;
}
}

// Check for "long click"
if (depressed && (now - _lastBounceTime > longClickTime))
{
if(_reportRelease){
_clickNHold = true;
}
// negative count for long clicks
clicks = 0 - _clickCount;
if(_lastClickCount == 0){
_lastClickCount = _clickCount;
}
_clickCount = 0;
}

Expand Down