diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2022-09-29 19:49:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 19:49:05 -0700 |
| commit | 8f7b382902c46b8335d4138bcd949e82fa14406d (patch) | |
| tree | 72b496416603f0a539dfee4452a6c715d097fafe /keyboards/p3d | |
| parent | adcdacf93c7d83306e794fad8f6c3c1ba19bd414 (diff) | |
P3D Glitch Configurator Fix and Keymap Touch-Up (#18534)
Diffstat (limited to 'keyboards/p3d')
| -rw-r--r-- | keyboards/p3d/glitch/info.json | 368 | ||||
| -rw-r--r-- | 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 @@ | |||
| 10 | }, | 10 | }, |
| 11 | "layouts": { | 11 | "layouts": { |
| 12 | "LAYOUT_all": { | 12 | "LAYOUT_all": { |
| 13 | "layout": [{ | 13 | "layout": [ |
| 14 | "x": 19.1, | 14 | { "label": "ESC", "x": 0.5, "y": 0.5 }, |
| 15 | "y": 0.1 | 15 | { "label": "1", "x": 1.5, "y": 0.5 }, |
| 16 | }, { | 16 | { "label": "2", "x": 3.25, "y": 1.0 }, |
| 17 | "label": "ESC", | 17 | { "label": "3", "x": 4.25, "y": 1.0 }, |
| 18 | "x": 0.5, | 18 | { "label": "4", "x": 5.25, "y": 1.0 }, |
| 19 | "y": 0.5 | 19 | { "label": "5", "x": 6.25, "y": 1.0 }, |
| 20 | }, { | 20 | { "label": "6", "x": 7.25, "y": 1.0 }, |
| 21 | "label": "1", | 21 | { "label": "7", "x": 10, "y": 1.0 }, |
| 22 | "x": 1.5, | 22 | { "label": "8", "x": 11, "y": 1.0 }, |
| 23 | "y": 0.5 | 23 | { "label": "9", "x": 12, "y": 1.0 }, |
| 24 | }, { | 24 | { "label": "0", "x": 13, "y": 1.0 }, |
| 25 | "label": "_", | 25 | { "label": "_", "x": 14.5, "y": 0.6 }, |
| 26 | "x": 14.5, | 26 | { "label": "+", "x": 15.5, "y": 0.6 }, |
| 27 | "y": 0.6 | 27 | { "label": "Back", "x": 16.5, "y": 0.6 }, |
| 28 | }, { | 28 | { "label": "Del", "x": 17.5, "y": 0.6 }, |
| 29 | "label": "+", | 29 | { "x": 19.1, "y": 0.1 }, |
| 30 | "x": 15.5, | 30 | |
| 31 | "y": 0.6 | 31 | { "label": "TAB", "x": 0.15, "y": 1.5, "w": 1.5 }, |
| 32 | }, { | 32 | { "label": "Q", "x": 1.65, "y": 1.5 }, |
| 33 | "label": "Back", | 33 | { "label": "W", "x": 3.75, "y": 2.0 }, |
| 34 | "x": 16.5, | 34 | { "label": "E", "x": 4.75, "y": 2.0 }, |
| 35 | "y": 0.6 | 35 | { "label": "R", "x": 5.75, "y": 2.0 }, |
| 36 | }, { | 36 | { "label": "T", "x": 6.75, "y": 2.0 }, |
| 37 | "label": "Del", | 37 | { "label": "Y", "x": 9.5, "y": 2.0 }, |
| 38 | "x": 17.5, | 38 | { "label": "U", "x": 10.5, "y": 2.0 }, |
| 39 | "y": 0.6 | 39 | { "label": "I", "x": 11.5, "y": 2.0 }, |
| 40 | }, { | 40 | { "label": "O", "x": 12.5, "y": 2.0 }, |
| 41 | "label": "2", | 41 | { "label": "P", "x": 14.35, "y": 1.6 }, |
| 42 | "x": 3.25, | 42 | { "label": "[", "x": 15.35, "y": 1.6 }, |
| 43 | "y": 1.0 | 43 | { "label": "]", "x": 16.35, "y": 1.6 }, |
| 44 | }, { | 44 | { "label": "\\", "x": 17.35, "y": 1.6, "w": 1.5 }, |
| 45 | "label": "3", | 45 | { "x": 19.1, "y": 1.6 }, |
| 46 | "x": 4.25, | 46 | |
| 47 | "y": 1.0 | 47 | { "label": "CAPS", "x": 0.15, "y": 2.5, "w": 1.75 }, |
| 48 | }, { | 48 | { "label": "A", "x": 1.9, "y": 2.5 }, |
| 49 | "label": "4", | 49 | { "label": "S", "x": 4, "y": 3.0 }, |
| 50 | "x": 5.25, | 50 | { "label": "D", "x": 5, "y": 3.0 }, |
| 51 | "y": 1.0 | 51 | { "label": "F", "x": 6, "y": 3.0 }, |
| 52 | }, { | 52 | { "label": "G", "x": 7, "y": 3.0 }, |
| 53 | "label": "5", | 53 | { "label": "H", "x": 9.75, "y": 3.0 }, |
| 54 | "x": 6.25, | 54 | { "label": "J", "x": 10.75, "y": 3.0 }, |
| 55 | "y": 1.0 | 55 | { "label": "K", "x": 11.75, "y": 3.0 }, |
| 56 | }, { | 56 | { "label": "L", "x": 12.75, "y": 3.0 }, |
| 57 | "label": "6", | 57 | { "label": ";", "x": 14.6, "y": 2.6 }, |
| 58 | "x": 7.25, | 58 | { "label": "'", "x": 15.6, "y": 2.6 }, |
| 59 | "y": 1.0 | 59 | { "label": "ENTER", "x": 16.6, "y": 2.6, "w": 2.25 }, |
| 60 | }, { | 60 | { "x": 19.1, "y": 2.6 }, |
| 61 | "label": "7", | 61 | |
| 62 | "x": 10, | 62 | { "label": "SHIFT", "x": 0, "y": 3.5, "w": 2.25 }, |
| 63 | "y": 1.0 | 63 | { "label": "Z", "x": 2.25, "y": 3.5 }, |
| 64 | }, { | 64 | { "label": "X", "x": 4.5, "y": 4.0 }, |
| 65 | "label": "8", | 65 | { "label": "C", "x": 5.5, "y": 4.0 }, |
| 66 | "x": 11, | 66 | { "label": "V", "x": 6.5, "y": 4.0 }, |
| 67 | "y": 1.0 | 67 | { "label": "B", "x": 7.5, "y": 4.0 }, |
| 68 | }, { | 68 | { "label": "BEE", "x": 9.25, "y": 4.0 }, |
| 69 | "label": "9", | 69 | { "label": "N", "x": 10.25, "y": 4.0 }, |
| 70 | "x": 12, | 70 | { "label": "M", "x": 11.25, "y": 4.0 }, |
| 71 | "y": 1.0 | 71 | { "label": ",", "x": 12.25, "y": 4.0 }, |
| 72 | }, { | 72 | { "label": ".", "x": 14.25, "y": 3.6 }, |
| 73 | "label": "0", | 73 | { "label": "?", "x": 15.25, "y": 3.6 }, |
| 74 | "x": 13, | 74 | { "label": "SHIFT", "x": 16.25, "y": 3.6, "w": 1.75 }, |
| 75 | "y": 1.0 | 75 | { "label": "UP", "x": 18.25, "y": 3.85 }, |
| 76 | }, { | 76 | { "x": 19.5, "y": 3.6 }, |
| 77 | "label": "TAB", | 77 | |
| 78 | "x": 0.15, | 78 | { "label": "CTRL", "x": 0, "y": 4.5, "w": 1.25 }, |
| 79 | "y": 1.5, | 79 | { "label": "WIN", "x": 1.25, "y": 4.5, "w": 1.25 }, |
| 80 | "w": 1.5 | 80 | { "x": 4.75, "y": 5.0, "w": 2.75 }, |
| 81 | }, { | 81 | { "label": "ALT", "x": 7.5, "y": 5.0, "w": 1.25 }, |
| 82 | "label": "Q", | 82 | { "label": "ALT", "x": 9.5, "y": 5.0, "w": 1.25 }, |
| 83 | "x": 1.65, | 83 | { "x": 10.75, "y": 5.0, "w": 2.25 }, |
| 84 | "y": 1.5 | 84 | { "label": "WIN", "x": 15, "y": 4.6 }, |
| 85 | }, { | 85 | { "label": "CTRL", "x": 16, "y": 4.6 }, |
| 86 | "label": "P", | 86 | { "label": "LEFT", "x": 17.25, "y": 4.85 }, |
| 87 | "x": 14.35, | 87 | { "label": "DOWN", "x": 18.25, "y": 4.85 }, |
| 88 | "y": 1.6 | 88 | { "label": "RIGHT", "x": 19.25, "y": 4.85 } |
| 89 | }, { | 89 | ] |
| 90 | "label": "[", | ||
| 91 | "x": 15.35, | ||
| 92 | "y": 1.6 | ||
| 93 | }, { | ||
| 94 | "label": "]", | ||
| 95 | "x": 16.35, | ||
| 96 | "y": 1.6 | ||
| 97 | }, { | ||
| 98 | "label": "\\", | ||
| 99 | "x": 17.35, | ||
| 100 | "y": 1.6, | ||
| 101 | "w": 1.5 | ||
| 102 | }, { | ||
| 103 | "x": 19.1, | ||
| 104 | "y": 1.6 | ||
| 105 | }, { | ||
| 106 | "label": "W", | ||
| 107 | "x": 3.75, | ||
| 108 | "y": 2.0 | ||
| 109 | }, { | ||
| 110 | "label": "E", | ||
| 111 | "x": 4.75, | ||
| 112 | "y": 2.0 | ||
| 113 | }, { | ||
| 114 | "label": "R", | ||
| 115 | "x": 5.75, | ||
| 116 | "y": 2.0 | ||
| 117 | }, { | ||
| 118 | "label": "T", | ||
| 119 | "x": 6.75, | ||
| 120 | "y": 2.0 | ||
| 121 | }, { | ||
| 122 | "label": "Y", | ||
| 123 | "x": 9.5, | ||
| 124 | "y": 2.0 | ||
| 125 | }, { | ||
| 126 | "label": "U", | ||
| 127 | "x": 10.5, | ||
| 128 | "y": 2.0 | ||
| 129 | }, { | ||
| 130 | "label": "I", | ||
| 131 | "x": 11.5, | ||
| 132 | "y": 2.0 | ||
| 133 | }, { | ||
| 134 | "label": "O", | ||
| 135 | "x": 12.5, | ||
| 136 | "y": 2.0 | ||
| 137 | }, { | ||
| 138 | "label": "CAPS", | ||
| 139 | "x": 0.15, | ||
| 140 | "y": 2.5, | ||
| 141 | "w": 1.75 | ||
| 142 | }, { | ||
| 143 | "label": "A", | ||
| 144 | "x": 1.9, | ||
| 145 | "y": 2.5 | ||
| 146 | }, { | ||
| 147 | "label": ";", | ||
| 148 | "x": 14.6, | ||
| 149 | "y": 2.6 | ||
| 150 | }, { | ||
| 151 | "label": "'", | ||
| 152 | "x": 15.6, | ||
| 153 | "y": 2.6 | ||
| 154 | }, { | ||
| 155 | "label": "ENTER", | ||
| 156 | "x": 16.6, | ||
| 157 | "y": 2.6, | ||
| 158 | "w": 2.25 | ||
| 159 | }, { | ||
| 160 | "x": 19.1, | ||
| 161 | "y": 2.6 | ||
| 162 | }, { | ||
| 163 | "label": "S", | ||
| 164 | "x": 4, | ||
| 165 | "y": 3.0 | ||
| 166 | }, { | ||
| 167 | "label": "D", | ||
| 168 | "x": 5, | ||
| 169 | "y": 3.0 | ||
| 170 | }, { | ||
| 171 | "label": "F", | ||
| 172 | "x": 6, | ||
| 173 | "y": 3.0 | ||
| 174 | }, { | ||
| 175 | "label": "G", | ||
| 176 | "x": 7, | ||
| 177 | "y": 3.0 | ||
| 178 | }, { | ||
| 179 | "label": "H", | ||
| 180 | "x": 9.75, | ||
| 181 | "y": 3.0 | ||
| 182 | }, { | ||
| 183 | "label": "J", | ||
| 184 | "x": 10.75, | ||
| 185 | "y": 3.0 | ||
| 186 | }, { | ||
| 187 | "label": "K", | ||
| 188 | "x": 11.75, | ||
| 189 | "y": 3.0 | ||
| 190 | }, { | ||
| 191 | "label": "L", | ||
| 192 | "x": 12.75, | ||
| 193 | "y": 3.0 | ||
| 194 | }, { | ||
| 195 | "label": "SHIFT", | ||
| 196 | "x": 0, | ||
| 197 | "y": 3.5, | ||
| 198 | "w": 2.25 | ||
| 199 | }, { | ||
| 200 | "label": "Z", | ||
| 201 | "x": 2.25, | ||
| 202 | "y": 3.5 | ||
| 203 | }, { | ||
| 204 | "label": ".", | ||
| 205 | "x": 14.25, | ||
| 206 | "y": 3.6 | ||
| 207 | }, { | ||
| 208 | "label": "?", | ||
| 209 | "x": 15.25, | ||
| 210 | "y": 3.6 | ||
| 211 | }, { | ||
| 212 | "label": "SHIFT", | ||
| 213 | "x": 16.25, | ||
| 214 | "y": 3.6, | ||
| 215 | "w": 1.75 | ||
| 216 | }, { | ||
| 217 | "x": 19.5, | ||
| 218 | "y": 3.6 | ||
| 219 | }, { | ||
| 220 | "label": "UP", | ||
| 221 | "x": 18.25, | ||
| 222 | "y": 3.85 | ||
| 223 | }, { | ||
| 224 | "label": "X", | ||
| 225 | "x": 4.5, | ||
| 226 | "y": 4.0 | ||
| 227 | }, { | ||
| 228 | "label": "C", | ||
| 229 | "x": 5.5, | ||
| 230 | "y": 4.0 | ||
| 231 | }, { | ||
| 232 | "label": "V", | ||
| 233 | "x": 6.5, | ||
| 234 | "y": 4.0 | ||
| 235 | }, { | ||
| 236 | "label": "B", | ||
| 237 | "x": 7.5, | ||
| 238 | "y": 4.0 | ||
| 239 | }, { | ||
| 240 | "label": "BEE", | ||
| 241 | "x": 9.25, | ||
| 242 | "y": 4.0 | ||
| 243 | }, { | ||
| 244 | "label": "N", | ||
| 245 | "x": 10.25, | ||
| 246 | "y": 4.0 | ||
| 247 | }, { | ||
| 248 | "label": "M", | ||
| 249 | "x": 11.25, | ||
| 250 | "y": 4.0 | ||
| 251 | }, { | ||
| 252 | "label": ",", | ||
| 253 | "x": 12.25, | ||
| 254 | "y": 4.0 | ||
| 255 | }, { | ||
| 256 | "label": "CTRL", | ||
| 257 | "x": 0, | ||
| 258 | "y": 4.5, | ||
| 259 | "w": 1.25 | ||
| 260 | }, { | ||
| 261 | "label": "WIN", | ||
| 262 | "x": 1.25, | ||
| 263 | "y": 4.5, | ||
| 264 | "w": 1.25 | ||
| 265 | }, { | ||
| 266 | "label": "WIN", | ||
| 267 | "x": 15, | ||
| 268 | "y": 4.6 | ||
| 269 | }, { | ||
| 270 | "label": "CTRL", | ||
| 271 | "x": 16, | ||
| 272 | "y": 4.6 | ||
| 273 | }, { | ||
| 274 | "label": "LEFT", | ||
| 275 | "x": 17.25, | ||
| 276 | "y": 4.85 | ||
| 277 | }, { | ||
| 278 | "label": "DOWN", | ||
| 279 | "x": 18.25, | ||
| 280 | "y": 4.85 | ||
| 281 | }, { | ||
| 282 | "label": "RIGHT", | ||
| 283 | "x": 19.25, | ||
| 284 | "y": 4.85 | ||
| 285 | }, { | ||
| 286 | "x": 4.75, | ||
| 287 | "y": 5.0, | ||
| 288 | "w": 2.75 | ||
| 289 | }, { | ||
| 290 | "label": "ALT", | ||
| 291 | "x": 7.5, | ||
| 292 | "y": 5.0, | ||
| 293 | "w": 1.25 | ||
| 294 | }, { | ||
| 295 | "label": "ALT", | ||
| 296 | "x": 9.5, | ||
| 297 | "y": 5.0, | ||
| 298 | "w": 1.25 | ||
| 299 | }, { | ||
| 300 | "x": 10.75, | ||
| 301 | "y": 5.0, | ||
| 302 | "w": 2.25 | ||
| 303 | }] | ||
| 304 | } | 90 | } |
| 305 | } | 91 | } |
| 306 | } | 92 | } |
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 @@ | |||
| 19 | 19 | ||
| 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 20 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 21 | [0] = LAYOUT_all( | 21 | [0] = LAYOUT_all( |
| 22 | 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, | 22 | 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, |
| 23 | 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, | 23 | 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, |
| 24 | 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, | 24 | 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, |
| 25 | 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, | 25 | 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, |
| 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 26 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 27 | ) | 27 | ) |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
