summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-01-13 10:24:20 +0900
committertmk <nobody@nowhere>2013-01-13 10:24:20 +0900
commit32633a42c74c65462370ef4a39a44a5784a98a06 (patch)
tree8bbc2fc62bcb06c9ea897507a4000b7336d1a6eb /keyboard
parent411de9cc22e927313a5a768f3bf41f2f99bca126 (diff)
Fix tap key using delaying_layer and waiting_key.
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/hhkb/keymap.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c
index 3ea75f5bb7..9fe1237aa4 100644
--- a/keyboard/hhkb/keymap.c
+++ b/keyboard/hhkb/keymap.c
@@ -149,8 +149,8 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
- LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN0, QUOT,ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,SLSH,RSFT,NO, \
LGUI,LALT, BTN1, RALT,FN0),
/* Layer 4: Matias half keyboard style (Space)
@@ -195,6 +195,8 @@ action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col) {
action_t action;
switch (key) {
case KC_A ... KC_EXSEL:
+ case KC_LCTRL ... KC_LGUI:
+ case KC_RCTRL ... KC_RGUI:
action.code = ACTION_KEY(key);
break;
case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
@@ -206,12 +208,14 @@ action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col) {
case KC_MS_UP ... KC_MS_ACCEL2:
action.code = ACTION_MOUSEKEY(key);
break;
+/*
case KC_LCTRL ... KC_LGUI:
action.code = ACTION_LMODS(MOD_BIT(key));
break;
case KC_RCTRL ... KC_RGUI:
action.code = ACTION_RMODS(MOD_BIT(key)>>4);
break;
+*/
case KC_FN0 ... KC_FN7:
action.code = pgm_read_word(&fn_actions[FN_INDEX(key)]);
break;