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

Pluckey: Fix QMK Configurator Implementation #15254

Merged
merged 5 commits into from
Nov 23, 2021
Merged

Pluckey: Fix QMK Configurator Implementation #15254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fceb68
rename LAYOUT to LAYOUT_all
noroadsleft Nov 21, 2021
7743a83
pluckey.h: add matrix diagram
noroadsleft Nov 21, 2021
01f60b5
pluckey.h: use XXX for KC_NO
noroadsleft Nov 21, 2021
f163df3
add LAYOUT_ergo macro with keymap
noroadsleft Nov 21, 2021
f1b01c5
info.json: correct key sequence
noroadsleft Nov 21, 2021
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
281 changes: 146 additions & 135 deletions keyboards/pluckey/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,147 +2,158 @@
"keyboard_name": "pluckey",
"url": "https://github.com/floookay/pluckey",
"maintainer": "floookay",
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
"layouts": {
"LAYOUT": {
"LAYOUT_all": {
"layout": [
{"x":3.5, "y":0},
{"x":15, "y":0},
{"x":2.5, "y":0.125},
{"x":4.5, "y":0.125},
{"x":14, "y":0.125},
{"x":16, "y":0.125},
{"x":5.5, "y":0.25},
{"x":6.5, "y":0.25},
{"x":12, "y":0.25},
{"x":13, "y":0.25},
{"x":0, "y":0.625, "w":1.5},
{"x":1.5, "y":0.625},
{"x":17, "y":0.625},
{"x":18, "y":0.625, "w":1.5},
{"x":3.5, "y":1.0},
{"x":15, "y":1.0},
{"x":2.5, "y":1.125},
{"x":4.5, "y":1.125},
{"x":14, "y":1.125},
{"x":16, "y":1.125},
{"x":5.5, "y":1.25},
{"x":6.5, "y":1.25},
{"x":12, "y":1.25},
{"x":13, "y":1.25},
{"x":0, "y":1.625, "w":1.5},
{"x":1.5, "y":1.625},
{"x":17, "y":1.625},
{"x":18, "y":1.625, "w":1.5},
{"x":3.5, "y":2},
{"x":15, "y":2},
{"x":2.5, "y":2.125},
{"x":4.5, "y":2.125},
{"x":14, "y":2.125},
{"x":16, "y":2.125},
{"x":5.5, "y":2.25},
{"x":6.5, "y":2.25},
{"x":12, "y":2.25},
{"x":13, "y":2.25},
{"x":0, "y":2.625, "w":1.5},
{"x":1.5, "y":2.625},
{"x":17, "y":2.625},
{"x":18, "y":2.625, "w":1.5},
{"x":6.5, "y":3.25},
{"x":12, "y":3.25},
{"x":3.5, "y":3},
{"x":15, "y":3},
{"x":2.5, "y":3.125},
{"x":4.5, "y":3.125},
{"x":14, "y":3.125},
{"x":16, "y":3.125},
{"x":5.5, "y":3.25},
{"x":13, "y":3.25},
{"x":0, "y":3.625, "w":1.5},
{"x":1.5, "y":3.625},
{"x":17, "y":3.625},
{"x":18, "y":3.625, "w":1.5},
{"x":7.5, "y":3.75},
{"x":11, "y":3.75},
{"x":3.5, "y":4},
{"x":15, "y":4},
{"x":2.5, "y":4.125},
{"x":4.5, "y":4.125},
{"x":14, "y":4.125},
{"x":16, "y":4.125},
{"x":5.75, "y":4.5, "w":1.5},
{"x":12.25, "y":4.5, "w":1.5},
{"x":7.25, "y":4.75},
{"x":11.25, "y":4.75}
{"label":"Esc", "x":0, "y":0.625, "w":1.5},
{"label":"1!", "x":1.5, "y":0.625},
{"label":"2@", "x":2.5, "y":0.125},
{"label":"3#", "x":3.5, "y":0},
{"label":"4$", "x":4.5, "y":0.125},
{"label":"5%", "x":5.5, "y":0.25},
{"label":"-_", "x":6.5, "y":0.25},
{"label":"=+", "x":12, "y":0.25},
{"label":"6^", "x":13, "y":0.25},
{"label":"7&", "x":14, "y":0.125},
{"label":"8*", "x":15, "y":0},
{"label":"9(", "x":16, "y":0.125},
{"label":"0)", "x":17, "y":0.625},
{"label":"`~", "x":18, "y":0.625, "w":1.5},

{"label":"Tab", "x":0, "y":1.625, "w":1.5},
{"label":"Q", "x":1.5, "y":1.625},
{"label":"W", "x":2.5, "y":1.125},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1.125},
{"label":"T", "x":5.5, "y":1.25},
{"label":"[{", "x":6.5, "y":1.25},
{"label":"]}", "x":12, "y":1.25},
{"label":"Y", "x":13, "y":1.25},
{"label":"U", "x":14, "y":1.125},
{"label":"I", "x":16, "y":1.125},
{"label":"O", "x":15, "y":1},
{"label":"P", "x":17, "y":1.625},
{"label":"\\|", "x":18, "y":1.625, "w":1.5},

{"label":"Ctrl", "x":0, "y":2.625, "w":1.5},
{"label":"A", "x":1.5, "y":2.625},
{"label":"S", "x":2.5, "y":2.125},
{"label":"D", "x":3.5, "y":2},
{"label":"F", "x":4.5, "y":2.125},
{"label":"G", "x":5.5, "y":2.25},
{"label":"(", "x":6.5, "y":2.25},
{"label":")", "x":12, "y":2.25},
{"label":"H", "x":13, "y":2.25},
{"label":"J", "x":14, "y":2.125},
{"label":"K", "x":16, "y":2.125},
{"label":"L", "x":15, "y":2},
{"label":";:", "x":17, "y":2.625},
{"label":"'\"", "x":18, "y":2.625, "w":1.5},

{"label":"Shift", "x":0, "y":3.625, "w":1.5},
{"label":"Z", "x":1.5, "y":3.625},
{"label":"X", "x":2.5, "y":3.125},
{"label":"C", "x":3.5, "y":3},
{"label":"V", "x":4.5, "y":3.125},
{"label":"B", "x":5.5, "y":3.25},
{"label":"{", "x":6.5, "y":3.25},
{"label":"Home", "x":7.5, "y":3.75},
{"label":"End", "x":11, "y":3.75},
{"label":"}", "x":12, "y":3.25},
{"label":"N", "x":13, "y":3.25},
{"label":"M", "x":14, "y":3.125},
{"label":",<", "x":15, "y":3},
{"label":".>", "x":16, "y":3.125},
{"label":"/?", "x":17, "y":3.625},
{"label":"Shift", "x":18, "y":3.625, "w":1.5},

{"label":"GUI", "x":2.5, "y":4.125},
{"label":"Alt", "x":3.5, "y":4},
{"label":"Lower", "x":4.5, "y":4.125},
{"label":"Space", "x":5.75, "y":4.5, "w":1.5},
{"label":"Backspace", "x":7.25, "y":4.75},
{"label":"Enter", "x":11.25, "y":4.75},
{"label":"Space", "x":12.25, "y":4.5, "w":1.5},
{"label":"Raise", "x":14, "y":4.125},
{"label":"Alt", "x":15, "y":4},
{"label":"MEH", "x":16, "y":4.125}
]
},
"LAYOUT_ergo": {
"layout": [
{"x":3.5, "y":0},
{"x":15, "y":0},
{"x":2.5, "y":0.125},
{"x":4.5, "y":0.125},
{"x":14, "y":0.125},
{"x":16, "y":0.125},
{"x":5.5, "y":0.25},
{"x":6.5, "y":0.25},
{"x":12, "y":0.25},
{"x":13, "y":0.25},
{"x":0, "y":0.625, "w":1.5},
{"x":1.5, "y":0.625},
{"x":17, "y":0.625},
{"x":18, "y":0.625, "w":1.5},
{"x":3.5, "y":1.0},
{"x":15, "y":1.0},
{"x":2.5, "y":1.125},
{"x":4.5, "y":1.125},
{"x":14, "y":1.125},
{"x":16, "y":1.125},
{"x":5.5, "y":1.25},
{"x":6.5, "y":1.25, "h":1.5},
{"x":12, "y":1.25, "h":1.5},
{"x":13, "y":1.25},
{"x":0, "y":1.625, "w":1.5},
{"x":1.5, "y":1.625},
{"x":17, "y":1.625},
{"x":18, "y":1.625, "w":1.5},
{"x":3.5, "y":2},
{"x":15, "y":2},
{"x":2.5, "y":2.125},
{"x":4.5, "y":2.125},
{"x":14, "y":2.125},
{"x":16, "y":2.125},
{"x":5.5, "y":2.25},
{"x":13, "y":2.25},
{"x":0, "y":2.625, "w":1.5},
{"x":1.5, "y":2.625},
{"x":17, "y":2.625},
{"x":18, "y":2.625, "w":1.5},
{"x":6.5, "y":2.75, "h":1.5},
{"x":12, "y":2.75, "h":1.5},
{"x":3.5, "y":3},
{"x":15, "y":3},
{"x":2.5, "y":3.125},
{"x":4.5, "y":3.125},
{"x":14, "y":3.125},
{"x":16, "y":3.125},
{"x":5.5, "y":3.25},
{"x":13, "y":3.25},
{"x":0, "y":3.625, "w":1.5},
{"x":1.5, "y":3.625},
{"x":17, "y":3.625},
{"x":18, "y":3.625, "w":1.5},
{"x":7.5, "y":3.75},
{"x":11, "y":3.75},
{"x":3.5, "y":4},
{"x":15, "y":4},
{"x":2.5, "y":4.125},
{"x":4.5, "y":4.125},
{"x":14, "y":4.125},
{"x":16, "y":4.125},
{"x":5.75, "y":4.5, "w":1.5},
{"x":12.25, "y":4.5, "w":1.5},
{"x":7.25, "y":4.75},
{"x":11.25, "y":4.75}
{"label":"Esc", "x":0, "y":0.625, "w":1.5},
{"label":"1!", "x":1.5, "y":0.625},
{"label":"2@", "x":2.5, "y":0.125},
{"label":"3#", "x":3.5, "y":0},
{"label":"4$", "x":4.5, "y":0.125},
{"label":"5%", "x":5.5, "y":0.25},
{"label":"-_", "x":6.5, "y":0.25},
{"label":"=+", "x":12, "y":0.25},
{"label":"6^", "x":13, "y":0.25},
{"label":"7&", "x":14, "y":0.125},
{"label":"8*", "x":15, "y":0},
{"label":"9(", "x":16, "y":0.125},
{"label":"0)", "x":17, "y":0.625},
{"label":"`~", "x":18, "y":0.625, "w":1.5},

{"label":"Tab", "x":0, "y":1.625, "w":1.5},
{"label":"Q", "x":1.5, "y":1.625},
{"label":"W", "x":2.5, "y":1.125},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1.125},
{"label":"T", "x":5.5, "y":1.25},
{"label":"[{", "x":6.5, "y":1.25, "h":1.5},
{"label":"]}", "x":12, "y":1.25, "h":1.5},
{"label":"Y", "x":13, "y":1.25},
{"label":"U", "x":14, "y":1.125},
{"label":"I", "x":16, "y":1.125},
{"label":"O", "x":15, "y":1},
{"label":"P", "x":17, "y":1.625},
{"label":"\\|", "x":18, "y":1.625, "w":1.5},

{"label":"Ctrl", "x":0, "y":2.625, "w":1.5},
{"label":"A", "x":1.5, "y":2.625},
{"label":"S", "x":2.5, "y":2.125},
{"label":"D", "x":3.5, "y":2},
{"label":"F", "x":4.5, "y":2.125},
{"label":"G", "x":5.5, "y":2.25},
{"label":"H", "x":13, "y":2.25},
{"label":"J", "x":14, "y":2.125},
{"label":"K", "x":16, "y":2.125},
{"label":"L", "x":15, "y":2},
{"label":";:", "x":17, "y":2.625},
{"label":"'\"", "x":18, "y":2.625, "w":1.5},

{"label":"Shift", "x":0, "y":3.625, "w":1.5},
{"label":"Z", "x":1.5, "y":3.625},
{"label":"X", "x":2.5, "y":3.125},
{"label":"C", "x":3.5, "y":3},
{"label":"V", "x":4.5, "y":3.125},
{"label":"B", "x":5.5, "y":3.25},
{"label":"(", "x":6.5, "y":2.75, "h":1.5},
{"label":"Home", "x":7.5, "y":3.75},
{"label":"End", "x":11, "y":3.75},
{"label":")", "x":12, "y":2.75, "h":1.5},
{"label":"N", "x":13, "y":3.25},
{"label":"M", "x":14, "y":3.125},
{"label":",<", "x":15, "y":3},
{"label":".>", "x":16, "y":3.125},
{"label":"/?", "x":17, "y":3.625},
{"label":"Shift", "x":18, "y":3.625, "w":1.5},

{"label":"GUI", "x":2.5, "y":4.125},
{"label":"Alt", "x":3.5, "y":4},
{"label":"Lower", "x":4.5, "y":4.125},
{"label":"Space", "x":5.75, "y":4.5, "w":1.5},
{"label":"Backspace", "x":7.25, "y":4.75},
{"label":"Enter", "x":11.25, "y":4.75},
{"label":"Space", "x":12.25, "y":4.5, "w":1.5},
{"label":"Raise", "x":14, "y":4.125},
{"label":"Alt", "x":15, "y":4},
{"label":"MEH", "x":16, "y":4.125}
]
}
}
Expand Down
8 changes: 4 additions & 4 deletions keyboards/pluckey/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@ enum custom_keycodes {

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT(
[_BASE] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_HOME, KC_END, KC_RCBR, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LGUI, KC_LALT, MO_LOW, KC_SPC, KC_BSPC, KC_ENT, KC_SPC, MO_RAIS, KC_RALT, KC_MEH
),
[_LOWER] = LAYOUT(
[_LOWER] = LAYOUT_all(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PSCR,
_______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN, KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______,
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_LPRN, KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
_______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,
_______, _______, MO_CURR, _______, KC_DEL, _______, _______, MO_ADJU, _______, _______
),
[_RAISE] = LAYOUT(
[_RAISE] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______,
_______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, KC_BTN4, KC_UP, KC_BTN5, _______, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______,
_______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______,
_______, _______, MO_ADJU, _______, KC_DEL, _______, _______, MO_CURR, _______, _______
),
[_ADJUST] = LAYOUT(
[_ADJUST] = LAYOUT_all(
KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______,
Expand Down
Loading