From 8f7b382902c46b8335d4138bcd949e82fa14406d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 29 Sep 2022 19:49:05 -0700 Subject: [PATCH] P3D Glitch Configurator Fix and Keymap Touch-Up (#18534) --- keyboards/p3d/glitch/info.json | 368 ++++-------------- keyboards/p3d/glitch/keymaps/default/keymap.c | 10 +- 2 files changed, 82 insertions(+), 296 deletions(-) diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json index 5015a2e28f..63d5cfc0ca 100644 --- a/keyboards/p3d/glitch/info.json +++ b/keyboards/p3d/glitch/info.json @@ -10,297 +10,83 @@ }, "layouts": { "LAYOUT_all": { - "layout": [{ - "x": 19.1, - "y": 0.1 - }, { - "label": "ESC", - "x": 0.5, - "y": 0.5 - }, { - "label": "1", - "x": 1.5, - "y": 0.5 - }, { - "label": "_", - "x": 14.5, - "y": 0.6 - }, { - "label": "+", - "x": 15.5, - "y": 0.6 - }, { - "label": "Back", - "x": 16.5, - "y": 0.6 - }, { - "label": "Del", - "x": 17.5, - "y": 0.6 - }, { - "label": "2", - "x": 3.25, - "y": 1.0 - }, { - "label": "3", - "x": 4.25, - "y": 1.0 - }, { - "label": "4", - "x": 5.25, - "y": 1.0 - }, { - "label": "5", - "x": 6.25, - "y": 1.0 - }, { - "label": "6", - "x": 7.25, - "y": 1.0 - }, { - "label": "7", - "x": 10, - "y": 1.0 - }, { - "label": "8", - "x": 11, - "y": 1.0 - }, { - "label": "9", - "x": 12, - "y": 1.0 - }, { - "label": "0", - "x": 13, - "y": 1.0 - }, { - "label": "TAB", - "x": 0.15, - "y": 1.5, - "w": 1.5 - }, { - "label": "Q", - "x": 1.65, - "y": 1.5 - }, { - "label": "P", - "x": 14.35, - "y": 1.6 - }, { - "label": "[", - "x": 15.35, - "y": 1.6 - }, { - "label": "]", - "x": 16.35, - "y": 1.6 - }, { - "label": "\\", - "x": 17.35, - "y": 1.6, - "w": 1.5 - }, { - "x": 19.1, - "y": 1.6 - }, { - "label": "W", - "x": 3.75, - "y": 2.0 - }, { - "label": "E", - "x": 4.75, - "y": 2.0 - }, { - "label": "R", - "x": 5.75, - "y": 2.0 - }, { - "label": "T", - "x": 6.75, - "y": 2.0 - }, { - "label": "Y", - "x": 9.5, - "y": 2.0 - }, { - "label": "U", - "x": 10.5, - "y": 2.0 - }, { - "label": "I", - "x": 11.5, - "y": 2.0 - }, { - "label": "O", - "x": 12.5, - "y": 2.0 - }, { - "label": "CAPS", - "x": 0.15, - "y": 2.5, - "w": 1.75 - }, { - "label": "A", - "x": 1.9, - "y": 2.5 - }, { - "label": ";", - "x": 14.6, - "y": 2.6 - }, { - "label": "'", - "x": 15.6, - "y": 2.6 - }, { - "label": "ENTER", - "x": 16.6, - "y": 2.6, - "w": 2.25 - }, { - "x": 19.1, - "y": 2.6 - }, { - "label": "S", - "x": 4, - "y": 3.0 - }, { - "label": "D", - "x": 5, - "y": 3.0 - }, { - "label": "F", - "x": 6, - "y": 3.0 - }, { - "label": "G", - "x": 7, - "y": 3.0 - }, { - "label": "H", - "x": 9.75, - "y": 3.0 - }, { - "label": "J", - "x": 10.75, - "y": 3.0 - }, { - "label": "K", - "x": 11.75, - "y": 3.0 - }, { - "label": "L", - "x": 12.75, - "y": 3.0 - }, { - "label": "SHIFT", - "x": 0, - "y": 3.5, - "w": 2.25 - }, { - "label": "Z", - "x": 2.25, - "y": 3.5 - }, { - "label": ".", - "x": 14.25, - "y": 3.6 - }, { - "label": "?", - "x": 15.25, - "y": 3.6 - }, { - "label": "SHIFT", - "x": 16.25, - "y": 3.6, - "w": 1.75 - }, { - "x": 19.5, - "y": 3.6 - }, { - "label": "UP", - "x": 18.25, - "y": 3.85 - }, { - "label": "X", - "x": 4.5, - "y": 4.0 - }, { - "label": "C", - "x": 5.5, - "y": 4.0 - }, { - "label": "V", - "x": 6.5, - "y": 4.0 - }, { - "label": "B", - "x": 7.5, - "y": 4.0 - }, { - "label": "BEE", - "x": 9.25, - "y": 4.0 - }, { - "label": "N", - "x": 10.25, - "y": 4.0 - }, { - "label": "M", - "x": 11.25, - "y": 4.0 - }, { - "label": ",", - "x": 12.25, - "y": 4.0 - }, { - "label": "CTRL", - "x": 0, - "y": 4.5, - "w": 1.25 - }, { - "label": "WIN", - "x": 1.25, - "y": 4.5, - "w": 1.25 - }, { - "label": "WIN", - "x": 15, - "y": 4.6 - }, { - "label": "CTRL", - "x": 16, - "y": 4.6 - }, { - "label": "LEFT", - "x": 17.25, - "y": 4.85 - }, { - "label": "DOWN", - "x": 18.25, - "y": 4.85 - }, { - "label": "RIGHT", - "x": 19.25, - "y": 4.85 - }, { - "x": 4.75, - "y": 5.0, - "w": 2.75 - }, { - "label": "ALT", - "x": 7.5, - "y": 5.0, - "w": 1.25 - }, { - "label": "ALT", - "x": 9.5, - "y": 5.0, - "w": 1.25 - }, { - "x": 10.75, - "y": 5.0, - "w": 2.25 - }] + "layout": [ + { "label": "ESC", "x": 0.5, "y": 0.5 }, + { "label": "1", "x": 1.5, "y": 0.5 }, + { "label": "2", "x": 3.25, "y": 1.0 }, + { "label": "3", "x": 4.25, "y": 1.0 }, + { "label": "4", "x": 5.25, "y": 1.0 }, + { "label": "5", "x": 6.25, "y": 1.0 }, + { "label": "6", "x": 7.25, "y": 1.0 }, + { "label": "7", "x": 10, "y": 1.0 }, + { "label": "8", "x": 11, "y": 1.0 }, + { "label": "9", "x": 12, "y": 1.0 }, + { "label": "0", "x": 13, "y": 1.0 }, + { "label": "_", "x": 14.5, "y": 0.6 }, + { "label": "+", "x": 15.5, "y": 0.6 }, + { "label": "Back", "x": 16.5, "y": 0.6 }, + { "label": "Del", "x": 17.5, "y": 0.6 }, + { "x": 19.1, "y": 0.1 }, + + { "label": "TAB", "x": 0.15, "y": 1.5, "w": 1.5 }, + { "label": "Q", "x": 1.65, "y": 1.5 }, + { "label": "W", "x": 3.75, "y": 2.0 }, + { "label": "E", "x": 4.75, "y": 2.0 }, + { "label": "R", "x": 5.75, "y": 2.0 }, + { "label": "T", "x": 6.75, "y": 2.0 }, + { "label": "Y", "x": 9.5, "y": 2.0 }, + { "label": "U", "x": 10.5, "y": 2.0 }, + { "label": "I", "x": 11.5, "y": 2.0 }, + { "label": "O", "x": 12.5, "y": 2.0 }, + { "label": "P", "x": 14.35, "y": 1.6 }, + { "label": "[", "x": 15.35, "y": 1.6 }, + { "label": "]", "x": 16.35, "y": 1.6 }, + { "label": "\\", "x": 17.35, "y": 1.6, "w": 1.5 }, + { "x": 19.1, "y": 1.6 }, + + { "label": "CAPS", "x": 0.15, "y": 2.5, "w": 1.75 }, + { "label": "A", "x": 1.9, "y": 2.5 }, + { "label": "S", "x": 4, "y": 3.0 }, + { "label": "D", "x": 5, "y": 3.0 }, + { "label": "F", "x": 6, "y": 3.0 }, + { "label": "G", "x": 7, "y": 3.0 }, + { "label": "H", "x": 9.75, "y": 3.0 }, + { "label": "J", "x": 10.75, "y": 3.0 }, + { "label": "K", "x": 11.75, "y": 3.0 }, + { "label": "L", "x": 12.75, "y": 3.0 }, + { "label": ";", "x": 14.6, "y": 2.6 }, + { "label": "'", "x": 15.6, "y": 2.6 }, + { "label": "ENTER", "x": 16.6, "y": 2.6, "w": 2.25 }, + { "x": 19.1, "y": 2.6 }, + + { "label": "SHIFT", "x": 0, "y": 3.5, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 3.5 }, + { "label": "X", "x": 4.5, "y": 4.0 }, + { "label": "C", "x": 5.5, "y": 4.0 }, + { "label": "V", "x": 6.5, "y": 4.0 }, + { "label": "B", "x": 7.5, "y": 4.0 }, + { "label": "BEE", "x": 9.25, "y": 4.0 }, + { "label": "N", "x": 10.25, "y": 4.0 }, + { "label": "M", "x": 11.25, "y": 4.0 }, + { "label": ",", "x": 12.25, "y": 4.0 }, + { "label": ".", "x": 14.25, "y": 3.6 }, + { "label": "?", "x": 15.25, "y": 3.6 }, + { "label": "SHIFT", "x": 16.25, "y": 3.6, "w": 1.75 }, + { "label": "UP", "x": 18.25, "y": 3.85 }, + { "x": 19.5, "y": 3.6 }, + + { "label": "CTRL", "x": 0, "y": 4.5, "w": 1.25 }, + { "label": "WIN", "x": 1.25, "y": 4.5, "w": 1.25 }, + { "x": 4.75, "y": 5.0, "w": 2.75 }, + { "label": "ALT", "x": 7.5, "y": 5.0, "w": 1.25 }, + { "label": "ALT", "x": 9.5, "y": 5.0, "w": 1.25 }, + { "x": 10.75, "y": 5.0, "w": 2.25 }, + { "label": "WIN", "x": 15, "y": 4.6 }, + { "label": "CTRL", "x": 16, "y": 4.6 }, + { "label": "LEFT", "x": 17.25, "y": 4.85 }, + { "label": "DOWN", "x": 18.25, "y": 4.85 }, + { "label": "RIGHT", "x": 19.25, "y": 4.85 } + ] } } } diff --git a/keyboards/p3d/glitch/keymaps/default/keymap.c b/keyboards/p3d/glitch/keymaps/default/keymap.c index 43aa53c9f1..da32a84506 100644 --- a/keyboards/p3d/glitch/keymaps/default/keymap.c +++ b/keyboards/p3d/glitch/keymaps/default/keymap.c @@ -19,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - 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_BSPC, KC_DEL, KC_MUTE, - 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_BSLS, KC_PGUP, - 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_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, 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, KC_BSPC, KC_DEL, KC_MUTE, + 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_BSLS, KC_PGUP, + 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_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) };