summaryrefslogtreecommitdiffstats
path: root/keyboard/hhkb
diff options
context:
space:
mode:
authorDaniel Svensson <dsvensson@gmail.com>2016-05-29 16:39:27 +0200
committerJack Humbert <jack.humb@gmail.com>2016-05-29 10:39:27 -0400
commitb85dd60397e139f787ae26552145391f34686f4d (patch)
treebf77eddbf64cf3cea1600da2e8ac3c35ab472ff7 /keyboard/hhkb
parent536ad6813a452328d8b3437c55c1984f84eecc79 (diff)
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)
Diffstat (limited to 'keyboard/hhkb')
-rw-r--r--keyboard/hhkb/Makefile2
-rw-r--r--keyboard/hhkb/matrix.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 21ba261a23..b6c3b869e4 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 14fae0b82c..2dfb2f5e1f 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();
}