Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'JIS' form factor layouts #21220

Merged
merged 12 commits into from
Jul 7, 2023
Merged

Add 'JIS' form factor layouts #21220

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
18037b8
add JIS form factor layouts
dunk2k Jun 12, 2023
89000cd
correct keymap.c
dunk2k Jun 12, 2023
de4c27a
update keymap.c
dunk2k Jun 12, 2023
98f2b2e
update info.json
dunk2k Jun 12, 2023
ff312b0
add community layout(s) to keyboards
dunk2k Jun 13, 2023
037812f
amend tkl_jis
dunk2k Jun 13, 2023
5d20e0e
Update layout.json
dunk2k Jun 13, 2023
727702a
update readme.md
dunk2k Jun 14, 2023
aa257f6
add `tk_f13_jis` and `60_jis`
dunk2k Jun 25, 2023
6896e49
amended layout macros
dunk2k Jun 25, 2023
67e9c8c
Additions
dunk2k Jun 25, 2023
a967a3b
Update info.json
dunk2k Jun 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/bpiphany/pegasushoof/2013/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scroll_lock": "C5",
"on_state": 0
},
"community_layouts": ["tkl_ansi"],
"community_layouts": ["tkl_ansi", "tkl_jis"],
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bpiphany/pegasushoof/2015/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scroll_lock": "C5",
"on_state": 0
},
"community_layouts": ["tkl_ansi"],
"community_layouts": ["tkl_ansi", "tkl_jis"],
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
1 change: 1 addition & 0 deletions keyboards/cipulot/rf_r1_8_9xu/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
},
"vid": "0x6369"
},
"community_layouts": ["tkl_jis", "tkl_iso_tsangan", "tkl_ansi_tsangan"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
2 changes: 1 addition & 1 deletion keyboards/converter/usb_usb/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"processor": "atmega32u4",
"community_layouts": ["fullsize_ansi", "fullsize_iso"],
"community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"],
"layouts": {
"LAYOUT_all": {
"layout": [
Expand Down
32 changes: 32 additions & 0 deletions layouts/default/fullsize_jis/default_fullsize_jis/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
* │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
* └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
* │ZHK│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ^ │ ¥ │Bsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
* │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ @ │ [ │ │ │Del│End│PgD│ │ 7 │ 8 │ 9 │ │
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
* │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ : │ ] │ │ │ 4 │ 5 │ 6 │ │
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ┌───┐ ├───┼───┼───┼───┤
* │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ \ │ Shft │ │ ↑ │ │ 1 │ 2 │ 3 │ │
* ├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┼───┴┬──┴─┬─┴─┬─┴─┬─┴─┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
* │Ctrl│GUI │Alt │Mhen│ Space │Henk│Kana│Alt│GUI│App│Ctrl│ │ ← │ ↓ │ → │ │ 0 │ . │ │
* └────┴────┴────┴────┴────────────┴────┴────┴───┴───┴───┴────┘ └───┴───┴───┘ └───────┴───┴───┘
*/
[0] = LAYOUT_fullsize_jis(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,

KC_GRV, 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_INT3, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
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, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
)
};
125 changes: 125 additions & 0 deletions layouts/default/fullsize_jis/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"keyboard_name": "Fullsize JIS layout",
"url": "",
"maintainer": "qmk",
"layouts": {
"LAYOUT_fullsize_jis": {
"layout": [
{"x": 0, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},
{"x": 5, "y": 0},
{"x": 6.5, "y": 0},
{"x": 7.5, "y": 0},
{"x": 8.5, "y": 0},
{"x": 9.5, "y": 0},
{"x": 11, "y": 0},
{"x": 12, "y": 0},
{"x": 13, "y": 0},
{"x": 14, "y": 0},
{"x": 15.25, "y": 0},
{"x": 16.25, "y": 0},
{"x": 17.25, "y": 0},

{"x": 0, "y": 1.25},
{"x": 1, "y": 1.25},
{"x": 2, "y": 1.25},
{"x": 3, "y": 1.25},
{"x": 4, "y": 1.25},
{"x": 5, "y": 1.25},
{"x": 6, "y": 1.25},
{"x": 7, "y": 1.25},
{"x": 8, "y": 1.25},
{"x": 9, "y": 1.25},
{"x": 10, "y": 1.25},
{"x": 11, "y": 1.25},
{"x": 12, "y": 1.25},
{"x": 13, "y": 1.25},
{"x": 14, "y": 1.25},
{"x": 15.25, "y": 1.25},
{"x": 16.25, "y": 1.25},
{"x": 17.25, "y": 1.25},
{"x": 18.5, "y": 1.25},
{"x": 19.5, "y": 1.25},
{"x": 20.5, "y": 1.25},
{"x": 21.5, "y": 1.25},
{"x": 0, "y": 2.25, "w": 1.5},

{"x": 1.5, "y": 2.25},
{"x": 2.5, "y": 2.25},
{"x": 3.5, "y": 2.25},
{"x": 4.5, "y": 2.25},
{"x": 5.5, "y": 2.25},
{"x": 6.5, "y": 2.25},
{"x": 7.5, "y": 2.25},
{"x": 8.5, "y": 2.25},
{"x": 9.5, "y": 2.25},
{"x": 10.5, "y": 2.25},
{"x": 11.5, "y": 2.25},
{"x": 12.5, "y": 2.25},
{"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
{"x": 15.25, "y": 2.25},
{"x": 16.25, "y": 2.25},
{"x": 17.25, "y": 2.25},
{"x": 18.5, "y": 2.25},
{"x": 19.5, "y": 2.25},
{"x": 20.5, "y": 2.25},
{"x": 21.5, "y": 2.25, "h": 2},

{"x": 0, "y": 3.25, "w": 1.75},
{"x": 1.75, "y": 3.25},
{"x": 2.75, "y": 3.25},
{"x": 3.75, "y": 3.25},
{"x": 4.75, "y": 3.25},
{"x": 5.75, "y": 3.25},
{"x": 6.75, "y": 3.25},
{"x": 7.75, "y": 3.25},
{"x": 8.75, "y": 3.25},
{"x": 9.75, "y": 3.25},
{"x": 10.75, "y": 3.25},
{"x": 11.75, "y": 3.25},
{"x": 12.75, "y": 3.25},
{"x": 18.5, "y": 3.25},
{"x": 19.5, "y": 3.25},
{"x": 20.5, "y": 3.25},

{"x": 0, "y": 4.25, "w": 2.25},
{"x": 2.25, "y": 4.25},
{"x": 3.25, "y": 4.25},
{"x": 4.25, "y": 4.25},
{"x": 5.25, "y": 4.25},
{"x": 6.25, "y": 4.25},
{"x": 7.25, "y": 4.25},
{"x": 8.25, "y": 4.25},
{"x": 9.25, "y": 4.25},
{"x": 10.25, "y": 4.25},
{"x": 11.25, "y": 4.25},
{"x": 12.25, "y": 4.25},
{"x": 13.25, "y": 4.25, "w": 1.75},
{"x": 16.25, "y": 4.25},
{"x": 18.5, "y": 4.25},
{"x": 19.5, "y": 4.25},
{"x": 20.5, "y": 4.25},
{"x": 21.5, "y": 4.25, "h": 2},

{"x": 0, "y": 5.25, "w": 1.25},
{"x": 1.25, "y": 5.25, "w": 1.25},
{"x": 2.5, "y": 5.25, "w": 1.25},
{"x": 3.75, "y": 5.25, "w": 1.25},
{"x": 5, "y": 5.25, "w": 3.25},
{"x": 8.25, "y": 5.25, "w": 1.25},
{"x": 9.5, "y": 5.25, "w": 1.25},
{"x": 10.75, "y": 5.25},
{"x": 11.75, "y": 5.25},
{"x": 12.75, "y": 5.25},
{"x": 13.75, "y": 5.25, "w": 1.25},
{"x": 15.25, "y": 5.25},
{"x": 16.25, "y": 5.25},
{"x": 17.25, "y": 5.25},
{"x": 18.5, "y": 5.25, "w": 2},
{"x": 20.5, "y": 5.25}
]
}
}
}
6 changes: 6 additions & 0 deletions layouts/default/fullsize_jis/layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[{a:7},"",{x:1},"","","","",{x:0.5},"","","","",{x:0.5},"","","","",{x:0.25},"","",""],
[{y:0.25},"","","","","","","","","","","","","","","",{x:0.25},"","","",{x:0.25},"","","",""],
[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",{x:0.25},"","","",{x:0.25},"","","",{h:2},""],
[{w:1.75},"","","","","","","","","","","","","",{x:4.75},"","",""],
[{w:2.25},"","","","","","","","","","","","",{w:1.75},"",{x:1.25},"",{x:1.25},"","","",{h:2},""],
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:3.25},"",{w:1.25},"",{w:1.25},"","","","",{w:1.25},"",{x:0.25},"","","",{x:0.25,w:2},"",""]
3 changes: 3 additions & 0 deletions layouts/default/fullsize_jis/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# fullsize_jis

LAYOUT_fullsize_jis
35 changes: 35 additions & 0 deletions layouts/default/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,24 @@ LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘└───┴───┴───┘
```

```
LAYOUT_tkl_jis
┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ┌───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┴─┬─┴──┬┴───┼───┴┬──┴─┬────┤ ┌───┼───┼───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└────┴────┴────┴────┴──────────────┴────┴────┴────┴────┴────┘ └───┴───┴───┘
```

```
LAYOUT_tkl_nofrow_ansi
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
Expand Down Expand Up @@ -872,6 +890,23 @@ LAYOUT_fullsize_iso
└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
```

```
LAYOUT_fullsize_jis
┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ │ └───┴───┴───┘ ├───┼───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ ┌───┐ ├───┼───┼───┼───┤
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
├────┬───┴┬──┴─┬─┴──┬┴───┴───┴───┼───┴┬──┴─┬─┴─┬─┴─┬─┴─┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤ │
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└────┴────┴────┴────┴────────────┴────┴────┴───┴───┴───┴────┘ └───┴───┴───┘ └───────┴───┴───┘
```

### Split Layouts

Expand Down
Loading