From 18e6c49f52b4c2cc1d8440b278ab15306485bfa3 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Sun, 7 Jun 2020 00:11:25 +0200
Subject: [PATCH] Made debounce respect the configured setting

---
 src/dpad.h      | 10 ++++------
 src/dpad3wire.h | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/dpad.h b/src/dpad.h
index 410421b..1d0f9da 100644
--- a/src/dpad.h
+++ b/src/dpad.h
@@ -63,29 +63,27 @@ void update()
         ButtonBack = 3
     };
 
-    constexpr auto debounceTime = 25;
-
-    if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > debounceTime)
+    if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceDown > debounceTime)
+    if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state) && now-debounceDown > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceConfirm > debounceTime)
+    if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state) && now-debounceConfirm > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceBack > debounceTime)
+    if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state) && now-debounceBack > settings.boardcomputerHardware.dpadDebounce)
     {
         InputDispatcher::backButton(std::get<ButtonBack>(state));
         std::get<ButtonBack>(lastState) = std::get<ButtonBack>(state);
diff --git a/src/dpad3wire.h b/src/dpad3wire.h
index 2ab66cb..8d3efe5 100644
--- a/src/dpad3wire.h
+++ b/src/dpad3wire.h
@@ -5,6 +5,7 @@
 #include "globals.h"
 
 #include "dpad.h"
+#include "globals.h"
 #include "types.h"
 
 namespace {
@@ -78,29 +79,27 @@ void update()
         ButtonBack = 2
     };
 
-    constexpr auto debounceTime = 25;
-
-    if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > debounceTime)
+    if (std::get<ButtonUp>(lastState) != std::get<ButtonUp>(state) && now-debounceUp > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceDown > debounceTime)
+    if (std::get<ButtonDown>(lastState) != std::get<ButtonDown>(state) && now-debounceDown > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceConfirm > debounceTime)
+    if (std::get<ButtonConfirm>(lastState) != std::get<ButtonConfirm>(state) && now-debounceConfirm > settings.boardcomputerHardware.dpadDebounce)
     {
         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) && now-debounceBack > debounceTime)
+    if (std::get<ButtonBack>(lastState) != std::get<ButtonBack>(state) && now-debounceBack > settings.boardcomputerHardware.dpadDebounce)
     {
         InputDispatcher::backButton(std::get<ButtonBack>(state));
         std::get<ButtonBack>(lastState) = std::get<ButtonBack>(state);