Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix build errors (#359)

Browse source 
* brings gh60 up-to-date (needs testing)

* brings hhkb up-to-date (needs testing)

* brings jd45 up-to-date (needs testing)
This commit is contained in:
Daniel Svensson 2016-05-29 16:39:27 +02:00 committed by Jack Humbert
parent 536ad6813a
commit b85dd60397
5 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
keyboard/gh60/Makefile
View file

@ -42,14 +42,14 @@
TARGET = gh60_lufa TARGET = gh60_lufa
# Directory common source filess exist # Directory common source filess exist
TOP_DIR = ../..
TMK_DIR = ../../tmk_core TMK_DIR = ../../tmk_core
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
# project specific files # project specific files
SRC = keymap_common.c \ SRC = matrix.c \
matrix.c \
led.c led.c
ifdef KEYMAP ifdef KEYMAP
@ -119,6 +119,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
CUSTOM_MATRIX = yes
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA 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 # Search Path
VPATH += $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
VPATH += $(TMK_DIR) VPATH += $(TMK_DIR)
include $(TMK_DIR)/protocol/lufa.mk include $(TOP_DIR)/quantum/quantum.mk
include $(TMK_DIR)/common.mk
include $(TMK_DIR)/rules.mk

30
keyboard/gh60/keymap_common.c
View file

@ -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)]) };
}

2
keyboard/hhkb/Makefile
View file

@ -56,7 +56,7 @@ SRC = hhkb_qmk.c \
ifdef KEYMAP ifdef KEYMAP
SRC := keymaps/keymaps/$(KEYMAP).c $(SRC) SRC := keymaps/keymaps/$(KEYMAP).c $(SRC)
else else
SRC := keymaps/keymaps/default.c $(SRC) SRC := keymaps/default.c $(SRC)
endif endif
CONFIG_H = config.h CONFIG_H = config.h

8
keyboard/hhkb/matrix.c
View file

@ -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) { void matrix_power_up(void) {
KEY_POWER_ON(); KEY_POWER_ON();
} }

2
keyboard/jd45/Makefile
View file

@ -56,7 +56,7 @@ SRC = jd45.c \
ifdef KEYMAP ifdef KEYMAP
SRC := keymaps/keymaps/(KEYMAP).c $(SRC) SRC := keymaps/keymaps/(KEYMAP).c $(SRC)
else else
SRC := keymaps/keymaps/default.c $(SRC) SRC := keymaps/default.c $(SRC)
endif endif
CONFIG_H = config.h CONFIG_H = config.h