From b5b119544a4e943b3eb56f6a32f350c428f532f7 Mon Sep 17 00:00:00 2001
From: Alex Ong <the.onga@gmail.com>
Date: Sat, 26 Jan 2019 22:44:33 +1100
Subject: [PATCH 1/4] Removed #include "matrix.h" from debounce.h
---
quantum/debounce.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/quantum/debounce.h b/quantum/debounce.h
index 8397823ebb..9ca05c6824 100644
--- a/quantum/debounce.h
+++ b/quantum/debounce.h
@@ -1,7 +1,5 @@
#pragma once
-#include "matrix.h"
-
// raw is the current key state
// on entry cooked is the previous debounced state
// on exit cooked is the current debounced state
From 7cb8d3c7a7fe4de4629af21a92f5415cdfdffa0c Mon Sep 17 00:00:00 2001
From: Alex Ong <the.onga@gmail.com>
Date: Sat, 26 Jan 2019 22:45:25 +1100
Subject: [PATCH 2/4] Bug fix - was using MATRIX_ROWS instead of num_rows
---
quantum/debounce/debounce_sym_g.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quantum/debounce/debounce_sym_g.c b/quantum/debounce/debounce_sym_g.c
index e365cdf037..63bf2a64be 100644
--- a/quantum/debounce/debounce_sym_g.c
+++ b/quantum/debounce/debounce_sym_g.c
@@ -45,7 +45,7 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
#else //no debouncing.
void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed)
{
- for (int i = 0; i < MATRIX_ROWS; i++) {
+ for (int i = 0; i < num_rows; i++) {
cooked[i] = raw[i];
}
}
From 039dde3a519d0626b9dbb2c79373f28b36d29af7 Mon Sep 17 00:00:00 2001
From: Alex Ong <the.onga@gmail.com>
Date: Sat, 26 Jan 2019 22:57:39 +1100
Subject: [PATCH 3/4] Fixed compilation error with debounce_sym_g
---
quantum/debounce/debounce_sym_g.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/quantum/debounce/debounce_sym_g.c b/quantum/debounce/debounce_sym_g.c
index 63bf2a64be..c8ab34e1a0 100644
--- a/quantum/debounce/debounce_sym_g.c
+++ b/quantum/debounce/debounce_sym_g.c
@@ -16,9 +16,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Basic global debounce algorithm. Used in 99% of keyboards at time of implementation
When no state changes have occured for DEBOUNCE milliseconds, we push the state.
*/
-#include "debounce.h"
#include "matrix.h"
#include "timer.h"
+#include "quantum.h"
#ifndef DEBOUNCE
#define DEBOUNCE 5
#endif
@@ -51,7 +51,7 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
}
#endif
-bool debounce_active() {
+bool debounce_active(void) {
return debouncing;
}
From d30d5eeb27b7dc66ef18e65dc150cf76121a7148 Mon Sep 17 00:00:00 2001
From: Alex Ong <the.onga@gmail.com>
Date: Sat, 26 Jan 2019 23:01:07 +1100
Subject: [PATCH 4/4] Renamed DEBOUNCE_ALGO to DEBOUNCE_TYPE
---
common_features.mk | 6 +++---
keyboards/handwired/xealous/rules.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common_features.mk b/common_features.mk
index 2c86fd31b0..8e2747d5a4 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -265,11 +265,11 @@ endif
DEBOUNCE_DIR:= $(QUANTUM_DIR)/debounce
# Debounce Modules. If implemented in matrix.c, don't use these.
-ifeq ($(strip $(DEBOUNCE_ALGO)), manual)
+ifeq ($(strip $(DEBOUNCE_TYPE)), custom)
# Do nothing. do your debouncing in matrix.c
-else ifeq ($(strip $(DEBOUNCE_ALGO)), sym_g)
+else ifeq ($(strip $(DEBOUNCE_TYPE)), sym_g)
QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c
-else ifeq ($(strip $(DEBOUNCE_ALGO)), eager_pk)
+else ifeq ($(strip $(DEBOUNCE_TYPE)), eager_pk)
QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_eager_pk.c
else # default algorithm. Won't be used if we have a custom_matrix that doesn't utilize it
QUANTUM_SRC += $(DEBOUNCE_DIR)/debounce_sym_g.c
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index 37afdaff93..7d07c9aa5f 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -68,7 +68,7 @@ SUBPROJECT_rev1 = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = no
-DEBOUNCE_ALGO = manual
+DEBOUNCE_TYPE = custom
LAYOUTS = split60