feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented basic debounce

Browse Source
This commit is contained in:
0xFEEDC0DE64
2020-06-06 23:20:40 +02:00
parent 8a61f2a803
commit 33692fa054
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dpad.h
View File

@ -44,6 +44,7 @@ State Helper<IN1, IN2, IN3, IN4>::read()
#ifdef FEATURE_DPAD
Helper<PINS_DPAD_UP, PINS_DPAD_DOWN, PINS_DPAD_CONFIRM, PINS_DPAD_BACK> helper;
State lastState;
millis_t debounceUp, debounceDown, debounceConfirm, debounceBack;
void init()
{
@ -61,27 +62,33 @@ void update()
ButtonBack = 3
};
if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state))
constexpr auto debounceTime = 50;
if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > debounceTime)
{
if (std::get<ButtonUp>(state))
InputDispatcher::rotate(-1);
std::get<ButtonUp>(lastState) = std::get<ButtonUp>(state);
debounceUp = now;
}
if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state))
if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state) && now-debounceDown > debounceTime)
{
if (std::get<ButtonDown>(state))
InputDispatcher::rotate(1);
std::get<ButtonDown>(lastState) = std::get<ButtonDown>(state);
debounceDown = now;
}
if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state))
if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state) && now-debounceConfirm > debounceTime)
{
InputDispatcher::confirmButton(std::get<ButtonConfirm>(state));
std::get<ButtonConfirm>(lastState) = std::get<ButtonConfirm>(state);
debounceConfirm = now;
}
if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state))
if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state) && now-debounceBack > debounceTime)
{
InputDispatcher::backButton(std::get<ButtonBack>(state));
std::get<ButtonBack>(lastState) = std::get<ButtonBack>(state);
debounceBack = now;
}
}
#endif

18
src/dpad3wire.h
View File

@ -58,10 +58,12 @@ dpad::State Helper<OUT, IN1, IN2>::read()
#ifdef FEATURE_DPAD_3WIRESW
Helper<PINS_DPAD_3WIRESW_OUT, PINS_DPAD_3WIRESW_IN1, PINS_DPAD_3WIRESW_IN2> helper;
dpad::State lastState;
millis_t debounceUp, debounceDown, debounceConfirm, debounceBack;
void init()
{
helper.begin();
debounceUp = debounceDown = debounceConfirm = debounceBack = millis();
}
void update()
@ -76,30 +78,34 @@ void update()
ButtonBack = 2
};
if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state))
constexpr auto debounceTime = 50;
if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > debounceTime)
{
if (std::get<ButtonUp>(state))
InputDispatcher::rotate(-1);
std::get<ButtonUp>(lastState) = std::get<ButtonUp>(state);
debounceUp = now;
}
if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state))
if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state) && now-debounceDown > debounceTime)
{
if (std::get<ButtonDown>(state))
InputDispatcher::rotate(1);
std::get<ButtonDown>(lastState) = std::get<ButtonDown>(state);
debounceDown = now;
}
if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state))
if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state) && now-debounceConfirm > debounceTime)
{
InputDispatcher::confirmButton(std::get<ButtonConfirm>(state));
std::get<ButtonConfirm>(lastState) = std::get<ButtonConfirm>(state);
debounceConfirm = now;
}
if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state))
if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state) && now-debounceBack > debounceTime)
{
InputDispatcher::backButton(std::get<ButtonBack>(state));
std::get<ButtonBack>(lastState) = std::get<ButtonBack>(state);
debounceBack = now;
}
lastState = state;
}
#endif
}