summaryrefslogtreecommitdiffstats
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-05-15 06:27:32 +0200
committerJack Humbert <jack.humb@gmail.com>2016-05-15 06:27:32 +0200
commit1a8c0dd22d6a2255511d0db6a456315541b5815b (patch)
tree6c7d5e9dc66f9ce864cfe87a72dfb47e6f06d3a7 /quantum/matrix.c
parent79d26f331a275c99f76a30d34752fbd65bb3f335 (diff)
downloadqmk_firmware-1a8c0dd22d6a2255511d0db6a456315541b5815b.tar.gz
qmk_firmware-1a8c0dd22d6a2255511d0db6a456315541b5815b.tar.xz
Leader key implementation (#326)
* implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * updates process_action functions to return bool
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r--quantum/matrix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 7d70f728d..cab39e117 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -55,12 +55,12 @@ static void unselect_rows(void);
static void select_row(uint8_t row);
__attribute__ ((weak))
-void matrix_init_kb(void) {
+void matrix_init_quantum(void) {
}
__attribute__ ((weak))
-void matrix_scan_kb(void) {
+void matrix_scan_quantum(void) {
}
@@ -93,7 +93,7 @@ void matrix_init(void)
matrix_debouncing[i] = 0;
}
- matrix_init_kb();
+ matrix_init_quantum();
}
@@ -157,7 +157,7 @@ uint8_t matrix_scan(void)
}
#endif
- matrix_scan_kb();
+ matrix_scan_quantum();
return 1;
}