summaryrefslogtreecommitdiff
path: root/hhkb
diff options
context:
space:
mode:
authortmk2010-12-08 01:47:57 +0900
committertmk2010-12-08 01:57:55 +0900
commit51f17f02317700e64b3c1113fe230d78bac7fecd (patch)
treea040a624004cd3cec2d2fd122069554a4039b8e1 /hhkb
parent66ece29b0e14534d57b680db47a5967d5264ca85 (diff)
add build option: NKRO_ENABLE(remove: USB_12KRO)
Diffstat (limited to 'hhkb')
-rw-r--r--hhkb/Makefile5
-rw-r--r--hhkb/keymap.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/hhkb/Makefile b/hhkb/Makefile
index c248a6758..bf5d75ee9 100644
--- a/hhkb/Makefile
+++ b/hhkb/Makefile
@@ -39,14 +39,15 @@
# To rebuild project do "make clean" then "make all".
#----------------------------------------------------------------------------
+# TODO: use config.h for build options?
VENDOR_ID = 0xFEED
PRODUCT_ID = 0xCAFE
MANUFACTURER = 't.m.k.'
-PRODUCT = 't.m.k. HHKB pro'
+PRODUCT = 'HHKB Mod'
DESCRIPTION = 't.m.k. firmware for HHKB pro'
MOUSE_DELAY_TIME = 127
-USB_12KRO = yes
+NKRO_ENABLE = true
# Target file name (without extension).
TARGET = tmk_hhkb
diff --git a/hhkb/keymap.c b/hhkb/keymap.c
index 42a830c52..fd9bcce8a 100644
--- a/hhkb/keymap.c
+++ b/hhkb/keymap.c
@@ -42,8 +42,8 @@ static const uint8_t PROGMEM fn_keycode[] = {
KB_NO, // FN_0 [NOT USED]
KB_NO, // FN_1 layer 1
KB_SLSH, // FN_2 layer 2
- KB_SCOLON, // FN_3 layer 3
- KB_SPACE, // FN_4 layer 4
+ KB_SCLN, // FN_3 layer 3
+ KB_SPC, // FN_4 layer 4
KB_NO, // FN_5 [NOT USED]
KB_NO, // FN_6 [NOT USED]
KB_NO // FN_7 layer 1
@@ -67,7 +67,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KB_TAB, KB_Q, KB_W, KB_E, KB_R, KB_T, KB_Y, KB_U, KB_I, KB_O, KB_P, KB_LBRC,KB_RBRC,KB_BSPC, \
KB_LCTL,KB_A, KB_S, KB_D, KB_F, KB_G, KB_H, KB_J, KB_K, KB_L, FN_3, KB_QUOT,KB_ENT, \
KB_LSFT,KB_Z, KB_X, KB_C, KB_V, KB_B, KB_N, KB_M, KB_COMM,KB_DOT, FN_2, KB_RSFT,FN_1, \
- KB_LGUI,KB_LALT,FN_4, KB_RALT,FN_7),
+ KB_LGUI,KB_LALT,FN_4, KB_RALT,KB_RGUI),
/* Layer 1: HHKB mode (HHKB Fn)
* ,-----------------------------------------------------------.