From b85dd60397e139f787ae26552145391f34686f4d Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Sun, 29 May 2016 16:39:27 +0200 Subject: Fix build errors (#359) * brings gh60 up-to-date (needs testing) * brings hhkb up-to-date (needs testing) * brings jd45 up-to-date (needs testing) --- keyboard/hhkb/Makefile | 2 +- keyboard/hhkb/matrix.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'keyboard/hhkb') diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile index 21ba261a2..b6c3b869e 100644 --- a/keyboard/hhkb/Makefile +++ b/keyboard/hhkb/Makefile @@ -56,7 +56,7 @@ SRC = hhkb_qmk.c \ ifdef KEYMAP SRC := keymaps/keymaps/$(KEYMAP).c $(SRC) else - SRC := keymaps/keymaps/default.c $(SRC) + SRC := keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/hhkb/matrix.c b/keyboard/hhkb/matrix.c index 14fae0b82..2dfb2f5e1 100644 --- a/keyboard/hhkb/matrix.c +++ b/keyboard/hhkb/matrix.c @@ -188,6 +188,14 @@ void matrix_print(void) } } +uint8_t matrix_key_count(void) { + uint8_t count = 0; + for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { + count += bitpop16(matrix_get_row(r)); + } + return count; +} + void matrix_power_up(void) { KEY_POWER_ON(); } -- cgit v1.2.3