diff options
| -rw-r--r-- | keyboards/hhkb/Makefile | 4 | ||||
| -rw-r--r-- | keyboards/hhkb/config.h | 6 | ||||
| -rw-r--r-- | keyboards/hhkb/hhkb.h | 27 | ||||
| -rw-r--r-- | keyboards/hhkb/keymaps/jp/Makefile | 1 | ||||
| -rw-r--r-- | keyboards/hhkb/keymaps/jp/keymap.c | 58 | ||||
| -rw-r--r-- | keyboards/hhkb/keymaps/rdg_jp/Makefile | 1 | ||||
| -rw-r--r-- | keyboards/hhkb/keymaps/rdg_jp/keymap.c | 65 |
7 files changed, 161 insertions, 1 deletions
diff --git a/keyboards/hhkb/Makefile b/keyboards/hhkb/Makefile index 53eece396..6fe973e1e 100644 --- a/keyboards/hhkb/Makefile +++ b/keyboards/hhkb/Makefile | |||
| @@ -78,6 +78,10 @@ ifndef QUANTUM_DIR | |||
| 78 | include ../../Makefile | 78 | include ../../Makefile |
| 79 | endif | 79 | endif |
| 80 | 80 | ||
| 81 | ifneq (, $(findstring yes, $(HHKB_JP))) | ||
| 82 | OPT_DEFS += -DHHKB_JP | ||
| 83 | endif | ||
| 84 | |||
| 81 | debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION | 85 | debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION |
| 82 | debug-on: all | 86 | debug-on: all |
| 83 | 87 | ||
diff --git a/keyboards/hhkb/config.h b/keyboards/hhkb/config.h index ee66e4457..3f0528b4b 100644 --- a/keyboards/hhkb/config.h +++ b/keyboards/hhkb/config.h | |||
| @@ -29,7 +29,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | #define DESCRIPTION q.m.k keyboard firmware for HHKB | 29 | #define DESCRIPTION q.m.k keyboard firmware for HHKB |
| 30 | 30 | ||
| 31 | /* key matrix size */ | 31 | /* key matrix size */ |
| 32 | #define MATRIX_ROWS 8 | 32 | #ifdef HHKB_JP |
| 33 | # define MATRIX_ROWS 16 | ||
| 34 | #else | ||
| 35 | # define MATRIX_ROWS 8 | ||
| 36 | #endif | ||
| 33 | #define MATRIX_COLS 8 | 37 | #define MATRIX_COLS 8 |
| 34 | 38 | ||
| 35 | #define TAPPING_TERM 200 | 39 | #define TAPPING_TERM 200 |
diff --git a/keyboards/hhkb/hhkb.h b/keyboards/hhkb/hhkb.h index cc756c456..e95125efc 100644 --- a/keyboards/hhkb/hhkb.h +++ b/keyboards/hhkb/hhkb.h | |||
| @@ -21,4 +21,31 @@ | |||
| 21 | { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ | 21 | { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | |||
| 25 | #define KEYMAP_JP( \ | ||
| 26 | K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \ | ||
| 27 | K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \ | ||
| 28 | K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \ | ||
| 29 | K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \ | ||
| 30 | K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4) \ | ||
| 31 | { \ | ||
| 32 | { KC_NO, KC_NO, K02, K03, K04, K05, K06, KC_NO }, \ | ||
| 33 | { KC_NO, KC_NO, K12, K13, K14, K15, K16, KC_NO }, \ | ||
| 34 | { KC_NO, KC_NO, K22, K23, K24, K25, K26, KC_NO }, \ | ||
| 35 | { KC_NO, KC_NO, K32, KC_NO, K34, KC_NO, KC_NO, KC_NO }, \ | ||
| 36 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 37 | { KC_NO, KC_NO, K52, K53, KC_NO, K55, K56, KC_NO }, \ | ||
| 38 | { KC_NO, KC_NO, K62, K63, K64, K65, K66, KC_NO }, \ | ||
| 39 | { KC_NO, KC_NO, K72, K73, K74, K75, K76, KC_NO }, \ | ||
| 40 | { KC_NO, KC_NO, K82, K83, K84, K85, K86, KC_NO }, \ | ||
| 41 | { KC_NO, KC_NO, K92, K93, K94, K95, K96, KC_NO }, \ | ||
| 42 | { KC_NO, KC_NO, KA2, KA3, KC_NO, KA5, KA6, KC_NO }, \ | ||
| 43 | { KC_NO, KC_NO, KB2, KB3, KB4, KB5, KB6, KC_NO }, \ | ||
| 44 | { KC_NO, KC_NO, KC2, KC_NO, KC4, KC5, KC6, KC_NO }, \ | ||
| 45 | { KC_NO, KC_NO, KD2, KD3, KD4, KD5, KD6, KC_NO }, \ | ||
| 46 | { KC_NO, KC_NO, KE2, KE3, KE4, KE5, KE6, KC_NO }, \ | ||
| 47 | { KC_NO, KC_NO, KF2, KF3, KF4, KF5, KF6, KC_NO } \ | ||
| 48 | } | ||
| 49 | |||
| 50 | |||
| 24 | #endif | 51 | #endif |
diff --git a/keyboards/hhkb/keymaps/jp/Makefile b/keyboards/hhkb/keymaps/jp/Makefile new file mode 100644 index 000000000..92986292a --- /dev/null +++ b/keyboards/hhkb/keymaps/jp/Makefile | |||
| @@ -0,0 +1 @@ | |||
| HHKB_JP=yes | |||
diff --git a/keyboards/hhkb/keymaps/jp/keymap.c b/keyboards/hhkb/keymaps/jp/keymap.c new file mode 100644 index 000000000..8525adce5 --- /dev/null +++ b/keyboards/hhkb/keymaps/jp/keymap.c | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | #include "hhkb.h" | ||
| 2 | |||
| 3 | #define _______ KC_TRNS | ||
| 4 | |||
| 5 | |||
| 6 | /* Layer 0: HHKB JP | ||
| 7 | * ,-----------------------------------------------------------. | ||
| 8 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| | ||
| 9 | * |-----------------------------------------------------------| | ||
| 10 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | ||
| 11 | * |------------------------------------------------------` Ent| | ||
| 12 | * |Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | | ||
| 13 | * |-----------------------------------------------------------| | ||
| 14 | * |Shft | Z| X| C| V| B| N| M| ,| .| /| \| Up|Sft| | ||
| 15 | * |-----------------------------------------------------------| | ||
| 16 | * | ||Ctl|Alt|Cmd| | Spc |Bsp| | | ||Lft|Dwn|Rgh| | ||
| 17 | * `-----------------------------------------------------------' | ||
| 18 | */ | ||
| 19 | |||
| 20 | /* Layer 1: HHKB mode (HHKB Fn) | ||
| 21 | * ,-----------------------------------------------------------. | ||
| 22 | * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del| | ||
| 23 | * |-----------------------------------------------------------| | ||
| 24 | * |Caps | | | | | | | |Psc|Slk|Pus|Up | | | | ||
| 25 | * |------------------------------------------------------` | | ||
| 26 | * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | | | ||
| 27 | * |-----------------------------------------------------------| | ||
| 28 | * | | | | | | | +| -|End|PgD|Dow| | | | | ||
| 29 | * |-----------------------------------------------------------| | ||
| 30 | * | || | | | | | | | | || | | | | ||
| 31 | * `-----------------------------------------------------------' | ||
| 32 | */ | ||
| 33 | |||
| 34 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 35 | [0] = KEYMAP_JP( | ||
| 36 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, | ||
| 37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
| 38 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, | ||
| 39 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT, | ||
| 40 | MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | ||
| 41 | ), | ||
| 42 | |||
| 43 | [1] = KEYMAP_JP( | ||
| 44 | KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, | ||
| 45 | KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, | ||
| 46 | _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT, | ||
| 47 | _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, | ||
| 48 | _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ | ||
| 49 | ) | ||
| 50 | }; | ||
| 51 | |||
| 52 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) { | ||
| 53 | return MACRO_NONE; | ||
| 54 | } | ||
| 55 | |||
| 56 | const uint16_t PROGMEM fn_actions[] = { | ||
| 57 | |||
| 58 | }; | ||
diff --git a/keyboards/hhkb/keymaps/rdg_jp/Makefile b/keyboards/hhkb/keymaps/rdg_jp/Makefile new file mode 100644 index 000000000..92986292a --- /dev/null +++ b/keyboards/hhkb/keymaps/rdg_jp/Makefile | |||
| @@ -0,0 +1 @@ | |||
| HHKB_JP=yes | |||
diff --git a/keyboards/hhkb/keymaps/rdg_jp/keymap.c b/keyboards/hhkb/keymaps/rdg_jp/keymap.c new file mode 100644 index 000000000..700ba3a0b --- /dev/null +++ b/keyboards/hhkb/keymaps/rdg_jp/keymap.c | |||
| @@ -0,0 +1,65 @@ | |||
| 1 | #include "hhkb.h" | ||
| 2 | |||
| 3 | #define _______ KC_TRNS | ||
| 4 | |||
| 5 | enum { | ||
| 6 | ZER, | ||
| 7 | HDN, | ||
| 8 | OSY | ||
| 9 | }; | ||
| 10 | |||
| 11 | |||
| 12 | #define CTL_ESC CTL_T(KC_ESC) | ||
| 13 | #define SFT_BSP SFT_T(KC_BSPC) | ||
| 14 | |||
| 15 | #define SCRNS3 LGUI(LCTL(LSFT(KC_3))) | ||
| 16 | #define SCRNS4 LGUI(LCTL(LSFT(KC_4))) | ||
| 17 | |||
| 18 | |||
| 19 | /* hhkb jp ~ layout | ||
| 20 | * ,-----------------------------------------------------------. | ||
| 21 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| | ||
| 22 | * |-----------------------------------------------------------| | ||
| 23 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | ||
| 24 | * |------------------------------------------------------` Ent| | ||
| 25 | * |Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | | ||
| 26 | * |-----------------------------------------------------------| | ||
| 27 | * |Shft | Z| X| C| V| B| N| M| ,| .| /| \| Up|Sft| | ||
| 28 | * |-----------------------------------------------------------| | ||
| 29 | * | ||Ctl|Alt|Cmd| | Spc |Bsp| | | ||Lft|Dwn|Rgh| | ||
| 30 | * `-----------------------------------------------------------' | ||
| 31 | */ | ||
| 32 | |||
| 33 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 34 | [ZER] = KEYMAP_JP( | ||
| 35 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INS, KC_BSPC, | ||
| 36 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
| 37 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_GRV, KC_ENT, | ||
| 38 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT, | ||
| 39 | MO(HDN), KC_LCTL, KC_LALT, KC_LGUI, MO(HDN), KC_SPC, SFT_BSP, MO(HDN), MO(OSY), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT | ||
| 40 | ), | ||
| 41 | |||
| 42 | [HDN] = KEYMAP_JP( | ||
| 43 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, | ||
| 44 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, | ||
| 45 | _______, KC_TILD, KC_GRV, KC_BSLS, KC_PIPE, KC_MINS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TILD, KC_GRV, _______, _______, | ||
| 46 | _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, _______, KC_ENT, _______, _______, _______, _______, KC_PGUP, _______, | ||
| 47 | _______, _______, _______, _______, _______, KC_UNDS , KC_DEL, _______, _______, _______, KC_HOME, KC_PGDN, KC_END | ||
| 48 | ), | ||
| 49 | |||
| 50 | [OSY] = KEYMAP_JP( | ||
| 51 | _______, _______, _______, SCRNS3, SCRNS4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 52 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 53 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 55 | _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ | ||
| 56 | ) | ||
| 57 | }; | ||
| 58 | |||
| 59 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) { | ||
| 60 | return MACRO_NONE; | ||
| 61 | } | ||
| 62 | |||
| 63 | const uint16_t PROGMEM fn_actions[] = { | ||
| 64 | |||
| 65 | }; | ||
