diff options
| author | Stephen Tudor <smt@smt.io> | 2017-01-28 00:51:07 -0500 |
|---|---|---|
| committer | Stephen Tudor <smt@smt.io> | 2017-01-28 00:51:07 -0500 |
| commit | fa72689145ccbee120c236111c0e8813afa7881a (patch) | |
| tree | 7eb408d19987ad05c6156331e50d6921c82aea50 /keyboards/infinity60/matrix.c | |
| parent | 63e406eca4da805617889f7ab769a781c0046742 (diff) | |
| parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
Merge branch 'master' into smt/planck
* master:
Clarify license on abnt2 keymap (#1038)
replace jackhumbert with qmk
Add gitter image, start update to qmk org
Remove COLEMAK from preonic_keycodes enum
layer defines to enum
Update readme for smt Preonic keymap
Add smt keymap for Preonic
updated all the other keymaps to support the new changes.
fix: infinity60 keyboard was not using quantum features.
Compare Makefile with itself instead of using `--help`
Diffstat (limited to 'keyboards/infinity60/matrix.c')
| -rw-r--r-- | keyboards/infinity60/matrix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index d2f1852885..b6ccf86c3a 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c @@ -62,6 +62,8 @@ void matrix_init(void) #endif memset(matrix, 0, MATRIX_ROWS); memset(matrix_debouncing, 0, MATRIX_ROWS); + + matrix_init_quantum(); } uint8_t matrix_scan(void) @@ -146,6 +148,7 @@ uint8_t matrix_scan(void) } debouncing = false; } + matrix_scan_quantum(); return 1; } |