From b21231177907051ce01a75f887948cbf393c0b1a Mon Sep 17 00:00:00 2001 From: Kuba Tyszko Date: Mon, 1 Oct 2018 14:18:58 -0700 Subject: [PATCH 1/2] Adding my colemak layout on HHKB JP --- keyboard/hhkb/keymap_colemak.c | 50 +++++++++++++++++++++++++++++++ keyboard/hhkb/keymap_jp_colemak.c | 50 +++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 keyboard/hhkb/keymap_colemak.c create mode 100644 keyboard/hhkb/keymap_jp_colemak.c diff --git a/keyboard/hhkb/keymap_colemak.c b/keyboard/hhkb/keymap_colemak.c new file mode 100644 index 0000000000..786a792c79 --- /dev/null +++ b/keyboard/hhkb/keymap_colemak.c @@ -0,0 +1,50 @@ +/* + * HHKB JP Layout + */ +#include "keymap_common.h" + + +#ifdef KEYMAP_SECTION_ENABLE +const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { +#else +const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { +#endif + /* Layer 0: Default Layer */ + KEYMAP_JP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, ZKHK,BSPC, \ + TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC,RBRC, \ + LCTL,A, R, S, T, D, H, N, E, I, O,QUOT,BSLS,ENT, \ + LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH,RO, UP, RSFT, \ + FN0, LALT,LALT,LGUI,LGUI, SPC, ENT,BSPC,RALT,FN0, LEFT,DOWN,RGHT), + + /* Layer 1: HHKB mode (HHKB Fn) + * ,-----------------------------------------------------------. + * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| + * |-----------------------------------------------------------| + * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | + * |------------------------------------------------------` | + * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | | + * |-----------------------------------------------------------| + * | | | | | | | +| -|End|PgD|Dow| | | | + * |-----------------------------------------------------------| + * | || | | | | | | | | || | | | + * `-----------------------------------------------------------' + */ + KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ + CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, \ + TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,TRNS,PENT, \ + TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,TRNS, \ + TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,DEL,TRNS,TRNS,TRNS,TRNS,TRNS), +}; + + + +/* + * Fn action definition + */ +#ifdef KEYMAP_SECTION_ENABLE +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +#else +const action_t fn_actions[] PROGMEM = { +#endif + [0] = ACTION_LAYER_MOMENTARY(1), +}; diff --git a/keyboard/hhkb/keymap_jp_colemak.c b/keyboard/hhkb/keymap_jp_colemak.c new file mode 100644 index 0000000000..786a792c79 --- /dev/null +++ b/keyboard/hhkb/keymap_jp_colemak.c @@ -0,0 +1,50 @@ +/* + * HHKB JP Layout + */ +#include "keymap_common.h" + + +#ifdef KEYMAP_SECTION_ENABLE +const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { +#else +const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { +#endif + /* Layer 0: Default Layer */ + KEYMAP_JP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, ZKHK,BSPC, \ + TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC,RBRC, \ + LCTL,A, R, S, T, D, H, N, E, I, O,QUOT,BSLS,ENT, \ + LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH,RO, UP, RSFT, \ + FN0, LALT,LALT,LGUI,LGUI, SPC, ENT,BSPC,RALT,FN0, LEFT,DOWN,RGHT), + + /* Layer 1: HHKB mode (HHKB Fn) + * ,-----------------------------------------------------------. + * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| + * |-----------------------------------------------------------| + * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | + * |------------------------------------------------------` | + * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | | + * |-----------------------------------------------------------| + * | | | | | | | +| -|End|PgD|Dow| | | | + * |-----------------------------------------------------------| + * | || | | | | | | | | || | | | + * `-----------------------------------------------------------' + */ + KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ + CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, \ + TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,TRNS,PENT, \ + TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,TRNS, \ + TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,DEL,TRNS,TRNS,TRNS,TRNS,TRNS), +}; + + + +/* + * Fn action definition + */ +#ifdef KEYMAP_SECTION_ENABLE +const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { +#else +const action_t fn_actions[] PROGMEM = { +#endif + [0] = ACTION_LAYER_MOMENTARY(1), +}; From 924ae8be4f668e99c95c585fbf3025013d2fee9d Mon Sep 17 00:00:00 2001 From: Kuba Tyszko Date: Mon, 1 Oct 2018 14:19:49 -0700 Subject: [PATCH 2/2] colemak clean up --- keyboard/hhkb/keymap_colemak.c | 50 ---------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 keyboard/hhkb/keymap_colemak.c diff --git a/keyboard/hhkb/keymap_colemak.c b/keyboard/hhkb/keymap_colemak.c deleted file mode 100644 index 786a792c79..0000000000 --- a/keyboard/hhkb/keymap_colemak.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * HHKB JP Layout - */ -#include "keymap_common.h" - - -#ifdef KEYMAP_SECTION_ENABLE -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { -#else -const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { -#endif - /* Layer 0: Default Layer */ - KEYMAP_JP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, ZKHK,BSPC, \ - TAB, Q, W, F, P, G, J, L, U, Y, SCLN, LBRC,RBRC, \ - LCTL,A, R, S, T, D, H, N, E, I, O,QUOT,BSLS,ENT, \ - LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH,RO, UP, RSFT, \ - FN0, LALT,LALT,LGUI,LGUI, SPC, ENT,BSPC,RALT,FN0, LEFT,DOWN,RGHT), - - /* Layer 1: HHKB mode (HHKB Fn) - * ,-----------------------------------------------------------. - * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| - * |-----------------------------------------------------------| - * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | - * |------------------------------------------------------` | - * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | | - * |-----------------------------------------------------------| - * | | | | | | | +| -|End|PgD|Dow| | | | - * |-----------------------------------------------------------| - * | || | | | | | | | | || | | | - * `-----------------------------------------------------------' - */ - KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, \ - TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,TRNS,PENT, \ - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,TRNS, \ - TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,DEL,TRNS,TRNS,TRNS,TRNS,TRNS), -}; - - - -/* - * Fn action definition - */ -#ifdef KEYMAP_SECTION_ENABLE -const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { -#else -const action_t fn_actions[] PROGMEM = { -#endif - [0] = ACTION_LAYER_MOMENTARY(1), -};