diff options
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/gh60/Makefile | 10 | ||||
| -rw-r--r-- | keyboard/gh60/keymap_common.c | 30 | ||||
| -rw-r--r-- | keyboard/hhkb/Makefile | 2 | ||||
| -rw-r--r-- | keyboard/hhkb/matrix.c | 8 | ||||
| -rw-r--r-- | keyboard/jd45/Makefile | 2 |
5 files changed, 15 insertions, 37 deletions
diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile index 4c8f9dc8ab..9429049fd9 100644 --- a/keyboard/gh60/Makefile +++ b/keyboard/gh60/Makefile @@ -42,14 +42,14 @@ TARGET = gh60_lufa # Directory common source filess exist +TOP_DIR = ../.. TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . # project specific files -SRC = keymap_common.c \ - matrix.c \ +SRC = matrix.c \ led.c ifdef KEYMAP @@ -119,6 +119,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration +CUSTOM_MATRIX = yes #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA @@ -128,8 +129,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # Search Path VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk
\ No newline at end of file +include $(TOP_DIR)/quantum/quantum.mk diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c deleted file mode 100644 index fdb1769e1c..0000000000 --- a/keyboard/gh60/keymap_common.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "keymap_common.h" - - -/* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) -{ - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); -} - -/* translates Fn keycode to action */ -action_t keymap_fn_to_action(uint8_t keycode) -{ - return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; -} 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(); } diff --git a/keyboard/jd45/Makefile b/keyboard/jd45/Makefile index f6a8d10c58..d270a6f8a7 100644 --- a/keyboard/jd45/Makefile +++ b/keyboard/jd45/Makefile @@ -56,7 +56,7 @@ SRC = jd45.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 |