From c6b23a8aca63c09fb620b2c29b20ed78ac76c9f6 Mon Sep 17 00:00:00 2001 From: JbLb Date: Sun, 19 Feb 2023 16:47:26 +0100 Subject: [PATCH] code cleanup --- src/my_buttons.cpp | 88 +--------------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/src/my_buttons.cpp b/src/my_buttons.cpp index 0322b52..bd0785e 100644 --- a/src/my_buttons.cpp +++ b/src/my_buttons.cpp @@ -1,5 +1,5 @@ #include -// #include "my_buttons.h" +#include "my_buttons.h" #include "Adafruit_MPR121.h" #ifndef _BV @@ -75,89 +75,3 @@ int b = -1; return b; } - - - - - - - - - - - - - - - - - - - - - - - - - - -/**** - - - - - int raw = analogRead(KEYS_PIN); - int b = -1; - if (raw >= 472) { - lastRawPressed = millis(); - if (raw >= 981) { - b = 1; - } else if (raw >= 894 && raw <= 966) { - b = 2; - } else if (raw >= 823 && raw < 877) { - b = 3; - } else if (raw >= 763 && raw <= 817) { - b = 4; - } else if (raw >= 707 && raw <= 753) { - b = 5; - } else if (raw >= 662 && raw <= 698) { - b = 6; - } else if (raw >= 622 && raw <= 698) { - b = 7; - } else if (raw >= 586 && raw <= 614) { - b = 8; - } else if (raw >= 556 && raw <= 584) { - b = 9; - } else if (raw >= 526 && raw <= 554) { - b = 10; - } else if (raw >= 501 && raw <= 519) { - b = 0; - } else if (raw >= 472 && raw <= 508) { - b = 11; - } - unsigned long currentClick = millis(); - if (lastButtonId != b) { - if (currentClick > lastClick + DEBOUNCING_DELAY) { - lastClick = currentClick; - lastButtonId = b; - } else { - b = -1; - } - } else { - if (currentClick > lastClick + LONG_CLICK_DELAY) { - lastButtonId = b; - b = b + 12; - lastClick = currentClick; - } else { - b = -1; - } - } - } else { - if (millis() - lastRawPressed > 100) { - lastButtonId = -1; - } - } - return b; -} - -***/