diff options
| author | tmk <hasu@tmk-kbd.com> | 2014-11-25 11:44:01 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2014-11-25 11:44:57 +0900 |
| commit | 4192bce16b6cf4c5acc10ea6b26fb714fc132e01 (patch) | |
| tree | 4addcf8c6f1a2651d895868b8e33c39238ba10f5 /keyboard | |
| parent | cc5693e0f13b02a281de04d5e39a4ffbecabf1ac (diff) | |
hhkb: Change keymap and bootmagic salt key
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/hhkb/config.h | 2 | ||||
| -rw-r--r-- | keyboard/hhkb/keymap_hasu.c | 4 | ||||
| -rw-r--r-- | keyboard/hhkb/keymap_hhkb.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h index 33af74ebb9..c0acc0a7ed 100644 --- a/keyboard/hhkb/config.h +++ b/keyboard/hhkb/config.h @@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ONESHOT_TIMEOUT 300 /* Boot Magic salt key: Space */ -#define BOOTMAGIC_KEY_SALT KC_FN6 +#define BOOTMAGIC_KEY_SALT KC_SPACE /* diff --git a/keyboard/hhkb/keymap_hasu.c b/keyboard/hhkb/keymap_hasu.c index e3d951bea7..8379c84f52 100644 --- a/keyboard/hhkb/keymap_hasu.c +++ b/keyboard/hhkb/keymap_hasu.c @@ -27,7 +27,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,FN6, \ FN7, Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \ - LGUI,LALT, FN4, FN5, RGUI), + LGUI,LALT, FN4, FN5, FN5), /* Layer 1: HHKB mode[HHKB Fn] * ,-----------------------------------------------------------. @@ -201,7 +201,7 @@ const uint16_t fn_actions[] PROGMEM = { [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash* [3] = ACTION_LAYER_TAP_KEY(3, KC_SCLN), // Mousekey layer with Semicolon* [4] = ACTION_LAYER_TAP_KEY(4, KC_SPC), // Mousekey layer with Space - [5] = ACTION_LAYER_MOMENTARY(4), // Mousekey layer(IJKL) + [5] = ACTION_LAYER_MOMENTARY(3), // Mousekey layer [6] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT), // RControl with tap Enter [7] = ACTION_MODS_ONESHOT(MOD_LSFT), // Oneshot Shift [8] = ACTION_MACRO(ALT_TAB), // Application switching diff --git a/keyboard/hhkb/keymap_hhkb.c b/keyboard/hhkb/keymap_hhkb.c index 1df16e13f7..1fc016f8e2 100644 --- a/keyboard/hhkb/keymap_hhkb.c +++ b/keyboard/hhkb/keymap_hhkb.c @@ -19,14 +19,14 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { * |-----------------------------------------------------------| * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| * `-----------------------------------------------------------' - * |Gui|Alt | Space |Alt |Gui| + * |Alt|Gui | Space |Gui |Alt| * `-------------------------------------------' */ KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, \ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \ LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,ENT, \ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN0, \ - LGUI,LALT, SPC, RALT,RGUI), + LALT,LGUI, SPC, RGUI,RALT), /* Layer 1: HHKB mode (HHKB Fn) * ,-----------------------------------------------------------. |