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

Jump to bottom

EC Pro X JIS Layout Touch-Up #21260

Merged
merged 4 commits into from
Jun 20, 2023
Merged

EC Pro X JIS Layout Touch-Up #21260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a4c242
[refactor] update `info.json` for readability
noroadsleft Jun 15, 2023
2e6bddb
[refactor] remove key labels from `info.json`
noroadsleft Jun 16, 2023
7bdc76e
[refactor] keymap refactor
noroadsleft Jun 16, 2023
e7cbdc7
[bugfix] move Enter key to home row
noroadsleft Jun 16, 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
142 changes: 73 additions & 69 deletions keyboards/cipulot/ec_prox/jis/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,75 +52,79 @@
"layouts": {
"LAYOUT_jp": {
"layout": [
{"label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0},
{"label": "0,1", "matrix": [0, 1], "x": 1.0, "y": 0.0},
{"label": "0,2", "matrix": [0, 2], "x": 2.0, "y": 0.0},
{"label": "0,3", "matrix": [0, 3], "x": 3.0, "y": 0.0},
{"label": "0,4", "matrix": [0, 4], "x": 4.0, "y": 0.0},
{"label": "0,5", "matrix": [0, 5], "x": 5.0, "y": 0.0},
{"label": "0,6", "matrix": [0, 6], "x": 6.0, "y": 0.0},
{"label": "0,7", "matrix": [0, 7], "x": 7.0, "y": 0.0},
{"label": "0,8", "matrix": [0, 8], "x": 8.0, "y": 0.0},
{"label": "0,9", "matrix": [0, 9], "x": 9.0, "y": 0.0},
{"label": "0,10", "matrix": [0, 10], "x": 10.0, "y": 0.0},
{"label": "0,11", "matrix": [0, 11], "x": 11.0, "y": 0.0},
{"label": "0,12", "matrix": [0, 12], "x": 12.0, "y": 0.0},
{"label": "0,13", "matrix": [0, 13], "x": 13.0, "y": 0.0},
{"label": "1,13", "matrix": [1, 13], "x": 14.0, "y": 0.0},
{"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0},
{"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1.0},
{"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1.0},
{"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1.0},
{"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1.0},
{"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1.0},
{"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1.0},
{"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1.0},
{"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1.0},
{"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1.0},
{"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1.0},
{"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1.0},
{"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1.0},
{"h": 2, "label": "2,13", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1.0},
{"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0},
{"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2.0},
{"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2.0},
{"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2.0},
{"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2.0},
{"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2.0},
{"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2.0},
{"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2.0},
{"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2.0},
{"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2.0},
{"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2.0},
{"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2.0},
{"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2.0},
{"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0.0, "y": 3.0},
{"label": "3,1", "matrix": [3, 1], "x": 2.0, "y": 3.0},
{"label": "3,2", "matrix": [3, 2], "x": 3.0, "y": 3.0},
{"label": "3,3", "matrix": [3, 3], "x": 4.0, "y": 3.0},
{"label": "3,4", "matrix": [3, 4], "x": 5.0, "y": 3.0},
{"label": "3,5", "matrix": [3, 5], "x": 6.0, "y": 3.0},
{"label": "3,6", "matrix": [3, 6], "x": 7.0, "y": 3.0},
{"label": "3,7", "matrix": [3, 7], "x": 8.0, "y": 3.0},
{"label": "3,8", "matrix": [3, 8], "x": 9.0, "y": 3.0},
{"label": "3,9", "matrix": [3, 9], "x": 10.0, "y": 3.0},
{"label": "3,10", "matrix": [3, 10], "x": 11.0, "y": 3.0},
{"label": "3,11", "matrix": [3, 11], "x": 12.0, "y": 3.0},
{"label": "3,12", "matrix": [3, 12], "x": 13.0, "y": 3.0},
{"label": "3,13", "matrix": [3, 13], "x": 14.0, "y": 3.0},
{"label": "4,0", "matrix": [4, 0], "x": 0.0, "y": 4.0},
{"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.0},
{"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.0},
{"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.0},
{"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.0},
{"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4.0},
{"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4.0},
{"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4.0},
{"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4.0},
{"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4.0},
{"label": "4,11", "matrix": [4, 11], "x": 12.0, "y": 4.0},
{"label": "4,12", "matrix": [4, 12], "x": 13.0, "y": 4.0},
{"label": "4,13", "matrix": [4, 13], "x": 14.0, "y": 4.0}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 13], "x": 13, "y": 0},
{"matrix": [1, 13], "x": 14, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [2, 12], "x": 12.75, "y": 2},
{"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},

{"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
{"matrix": [3, 1], "x": 2, "y": 3},
{"matrix": [3, 2], "x": 3, "y": 3},
{"matrix": [3, 3], "x": 4, "y": 3},
{"matrix": [3, 4], "x": 5, "y": 3},
{"matrix": [3, 5], "x": 6, "y": 3},
{"matrix": [3, 6], "x": 7, "y": 3},
{"matrix": [3, 7], "x": 8, "y": 3},
{"matrix": [3, 8], "x": 9, "y": 3},
{"matrix": [3, 9], "x": 10, "y": 3},
{"matrix": [3, 10], "x": 11, "y": 3},
{"matrix": [3, 11], "x": 12, "y": 3},
{"matrix": [3, 12], "x": 13, "y": 3},
{"matrix": [3, 13], "x": 14, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1.25, "y": 4},
{"matrix": [4, 2], "x": 2.25, "y": 4},
{"matrix": [4, 3], "x": 3.25, "y": 4},
{"matrix": [4, 4], "x": 4.25, "y": 4},
{"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.5},
{"matrix": [4, 7], "x": 7.75, "y": 4},
{"matrix": [4, 8], "x": 8.75, "y": 4},
{"matrix": [4, 9], "x": 9.75, "y": 4},
{"matrix": [4, 10], "x": 10.75, "y": 4},
{"matrix": [4, 11], "x": 12, "y": 4},
{"matrix": [4, 12], "x": 13, "y": 4},
{"matrix": [4, 13], "x": 14, "y": 4}
]
}
}
Expand Down
12 changes: 6 additions & 6 deletions keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
[0] = LAYOUT_jp(
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, JP_YEN, KC_BSPC,
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_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,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
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, JP_YEN, KC_BSPC,
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_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,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_jp(
_______, 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,
_______, 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,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
Expand Down
20 changes: 10 additions & 10 deletions keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
[0] = LAYOUT_jp(
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, JP_YEN, KC_BSPC,
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_ENT,
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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
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, JP_YEN, KC_BSPC,
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_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,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_UNDS, KC_UP, KC_RSFT,
MO(1), JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN, KC_SPC, JP_HENK, JP_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_jp(
_______, 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,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, KC_PENT,
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
_______, 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,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______,
_______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
_______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______),

[2] = LAYOUT_jp(
RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),

[3] = LAYOUT_jp(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
// clang-format on
};