From 24488e043eb61e6e53dfcc2e391a1ed317aeb5c7 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 Aug 2022 11:30:26 -0700 Subject: SKergo Refactor (#17877) * skergo.h: use ___ for KC_NO * skergo.h: use 3-character notation * skergo.h: add matrix diagram * add LAYOUT_all macro * update grid alignment of LAYOUT macro and keymaps * refactor keymaps Refactor keymaps to use the `LAYOUT_all` macro. Converts tabs to spaces. This change necessitates the following changes to keymaps: - The keycodes for Page Up, Page Down, and End each move up one row - all as the last keys on their new rows. - The keycode for the secondary B key moves up one row, inserted between the primary (left side) B and the N. * remove LAYOUT macro * rename LAYOUT_all macro to LAYOUT_split_bs * add LAYOUT_2u_bs macro * readme.md: add flashing example * info.json: correct maintainer value Update to reference maintainer's GitHub username. --- keyboards/skergo/info.json | 221 ++++++++++++++++++++++++++++++--------------- 1 file changed, 149 insertions(+), 72 deletions(-) (limited to 'keyboards/skergo/info.json') diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json index 06bcd31f70..83e277a91d 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -1,84 +1,161 @@ { "keyboard_name": "SKErgo", "url": "https://keyz.io", - "maintainer": "Keyz.io", + "maintainer": "kevinzhao-tech", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_split_bs" + }, "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3.75, "y":0}, - {"label":"4", "x":4.75, "y":0}, - {"label":"5", "x":5.75, "y":0}, - {"label":"6", "x":6.75, "y":0}, - {"label":"7", "x":9.25, "y":0}, - {"label":"8", "x":10.25, "y":0}, - {"label":"9", "x":11.25, "y":0}, - {"label":"0", "x":12.25, "y":0}, - {"label":"-", "x":13.5, "y":0}, - {"label":"=", "x":14.5, "y":0}, - {"label":"~", "x":15.5, "y":0}, - {"label":"Backspace", "x":16.5, "y":0}, + "LAYOUT_2u_bs": { + "layout": [ + {"label":"Esc", "x":0.5, "y":0.25}, + {"label":"1!", "x":1.5, "y":0.25}, + {"label":"2@", "x":2.5, "y":0.25}, + {"label":"3#", "x":3.5, "y":0.25}, + {"label":"4$", "x":4.5, "y":0.25}, + {"label":"5%", "x":5.5, "y":0.25}, + {"label":"6^", "x":6.5, "y":0.25}, + {"label":"7&", "x":8.75, "y":0.25}, + {"label":"8*", "x":9.75, "y":0.25}, + {"label":"9(", "x":10.75, "y":0.25}, + {"label":"0)", "x":11.75, "y":0.25}, + {"label":"-_", "x":12.75, "y":0.25}, + {"label":"=+", "x":13.75, "y":0.25}, + {"label":"Backspace", "x":14.75, "y":0.25, "w":2}, + {"label":"Page Up", "x":17, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":3.25, "y":1}, - {"label":"E", "x":4.25, "y":1}, - {"label":"R", "x":5.25, "y":1}, - {"label":"T", "x":6.25, "y":1}, - {"label":"Y", "x":8.75, "y":1}, - {"label":"U", "x":9.75, "y":1}, - {"label":"I", "x":10.75, "y":1}, - {"label":"O", "x":11.75, "y":1}, - {"label":"P", "x":12.75, "y":1}, - {"label":"{", "x":14.25, "y":1}, - {"label":"}", "x":15.25, "y":1}, - {"label":"|", "x":16.25, "y":1, "w":1.5}, - {"label":"Pg Up", "x":18, "y":0}, + {"label":"Tab", "w":1.5, "x":0.25, "y":1.25}, + {"label":"Q", "x":1.75, "y":1.25}, + {"label":"W", "x":2.75, "y":1.25}, + {"label":"E", "x":3.75, "y":1.25}, + {"label":"R", "x":4.75, "y":1.25}, + {"label":"T", "x":5.75, "y":1.25}, + {"label":"Y", "x":8.4, "y":1.25}, + {"label":"U", "x":9.4, "y":1.25}, + {"label":"I", "x":10.4, "y":1.25}, + {"label":"O", "x":11.4, "y":1.25}, + {"label":"P", "x":12.4, "y":1.25}, + {"label":"[{", "x":13.4, "y":1.25}, + {"label":"]}", "x":14.4, "y":1.25}, + {"label":"\\|", "w":1.5, "x":15.4, "y":1.25}, + {"label":"Page Down", "x":17.15, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":3.5, "y":2}, - {"label":"D", "x":4.5, "y":2}, - {"label":"F", "x":5.5, "y":2}, - {"label":"G", "x":6.5, "y":2}, - {"label":"H", "x":9, "y":2}, - {"label":"J", "x":10, "y":2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2}, - {"label":":", "x":13.5, "y":2}, - {"label":"\"", "x":14.5, "y":2}, - {"label":"Enter", "x":15.5, "y":2, "w":2.25}, - {"label":"Pg Dn", "x":18.25, "y":1}, + {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25}, + {"label":"A", "x":1.9, "y":2.25}, + {"label":"S", "x":2.9, "y":2.25}, + {"label":"D", "x":3.9, "y":2.25}, + {"label":"F", "x":4.9, "y":2.25}, + {"label":"G", "x":5.9, "y":2.25}, + {"label":"H", "x":8.75, "y":2.25}, + {"label":"J", "x":9.75, "y":2.25}, + {"label":"K", "x":10.75, "y":2.25}, + {"label":"L", "x":11.75, "y":2.25}, + {"label":";:", "x":12.75, "y":2.25}, + {"label":"'\"", "x":13.75, "y":2.25}, + {"label":"Enter", "w":2.25, "x":14.75, "y":2.25}, + {"label":"End", "x":17.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.75, "y":3}, - {"label":"C", "x":4.75, "y":3}, - {"label":"V", "x":5.75, "y":3}, - {"label":"B", "x":6.75, "y":3}, - {"label":"B", "x":8.25, "y":3}, - {"label":"N", "x":9.25, "y":3}, - {"label":"M", "x":10.25, "y":3}, - {"label":"<", "x":11.25, "y":3}, - {"label":">", "x":12.25, "y":3}, - {"label":"?", "x":14.25, "y":3}, - {"label":"Shift", "x":15.25, "y":3, "w":1.75}, - {"label":"Up", "x":17.25, "y":3}, - {"label":"End", "x":18.5, "y":2}, + {"label":"Shift", "w":2.25, "x":0, "y":3.25}, + {"label":"Z", "x":2.25, "y":3.25}, + {"label":"X", "x":3.25, "y":3.25}, + {"label":"C", "x":4.25, "y":3.25}, + {"label":"V", "x":5.25, "y":3.25}, + {"label":"B", "x":6.25, "y":3.25}, + {"label":"B", "x":8.25, "y":3.25}, + {"label":"N", "x":9.25, "y":3.25}, + {"label":"M", "x":10.25, "y":3.25}, + {"label":",<", "x":11.25, "y":3.25}, + {"label":".>", "x":12.25, "y":3.25}, + {"label":"/?", "x":13.25, "y":3.25}, + {"label":"Shift", "w":1.75, "x":14.25, "y":3.25}, + {"label":"\u2191", "x":16.25, "y":3.5}, - {"label":"L_Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"L_Alt", "x":3.75, "y":4, "w":1.5}, - {"label":"L_Space", "x":5.25, "y":4, "w":2}, - {"label":"Fn", "x":7.25, "y":4}, - {"label":"R_Space", "x":9, "y":4, "w":2.75}, + {"label":"Ctrl", "w":1.5, "x":0, "y":4.25}, + {"label":"Alt", "w":1.5, "x":3.25, "y":4.25}, + {"label":"Space", "w":2, "x":4.75, "y":4.25}, + {"label":"GUI", "x":6.75, "y":4.25}, + {"label":"Space", "w":2.75, "x":8.75, "y":4.25}, + {"label":"Fn", "w":1.5, "x":11.5, "y":4.25}, + {"label":"\u2190", "x":15.25, "y":4.5}, + {"label":"\u2193", "x":16.25, "y":4.5}, + {"label":"\u2192", "x":17.25, "y":4.5} + ] + }, + "LAYOUT_split_bs": { + "layout": [ + {"label":"Esc", "x":0.5, "y":0.25}, + {"label":"1!", "x":1.5, "y":0.25}, + {"label":"2@", "x":2.5, "y":0.25}, + {"label":"3#", "x":3.5, "y":0.25}, + {"label":"4$", "x":4.5, "y":0.25}, + {"label":"5%", "x":5.5, "y":0.25}, + {"label":"6^", "x":6.5, "y":0.25}, + {"label":"7&", "x":8.75, "y":0.25}, + {"label":"8*", "x":9.75, "y":0.25}, + {"label":"9(", "x":10.75, "y":0.25}, + {"label":"0)", "x":11.75, "y":0.25}, + {"label":"-_", "x":12.75, "y":0.25}, + {"label":"=+", "x":13.75, "y":0.25}, + {"label":"Backspace", "x":14.75, "y":0.25}, + {"label":"Backspace", "x":15.75, "y":0.25}, + {"label":"Page Up", "x":17, "y":0}, - {"label":"R_Alt", "x":11.75, "y":4, "w":1.5}, - {"label":"Left","x":16.25, "y":4}, - {"label":"Down","x":17.25, "y":4}, - {"label":"Right","x":18.25, "y":4} - ] + {"label":"Tab", "w":1.5, "x":0.25, "y":1.25}, + {"label":"Q", "x":1.75, "y":1.25}, + {"label":"W", "x":2.75, "y":1.25}, + {"label":"E", "x":3.75, "y":1.25}, + {"label":"R", "x":4.75, "y":1.25}, + {"label":"T", "x":5.75, "y":1.25}, + {"label":"Y", "x":8.4, "y":1.25}, + {"label":"U", "x":9.4, "y":1.25}, + {"label":"I", "x":10.4, "y":1.25}, + {"label":"O", "x":11.4, "y":1.25}, + {"label":"P", "x":12.4, "y":1.25}, + {"label":"[{", "x":13.4, "y":1.25}, + {"label":"]}", "x":14.4, "y":1.25}, + {"label":"\\|", "w":1.5, "x":15.4, "y":1.25}, + {"label":"Page Down", "x":17.15, "y":1}, + + {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25}, + {"label":"A", "x":1.9, "y":2.25}, + {"label":"S", "x":2.9, "y":2.25}, + {"label":"D", "x":3.9, "y":2.25}, + {"label":"F", "x":4.9, "y":2.25}, + {"label":"G", "x":5.9, "y":2.25}, + {"label":"H", "x":8.75, "y":2.25}, + {"label":"J", "x":9.75, "y":2.25}, + {"label":"K", "x":10.75, "y":2.25}, + {"label":"L", "x":11.75, "y":2.25}, + {"label":";:", "x":12.75, "y":2.25}, + {"label":"'\"", "x":13.75, "y":2.25}, + {"label":"Enter", "w":2.25, "x":14.75, "y":2.25}, + {"label":"End", "x":17.25, "y":2}, + + {"label":"Shift", "w":2.25, "x":0, "y":3.25}, + {"label":"Z", "x":2.25, "y":3.25}, + {"label":"X", "x":3.25, "y":3.25}, + {"label":"C", "x":4.25, "y":3.25}, + {"label":"V", "x":5.25, "y":3.25}, + {"label":"B", "x":6.25, "y":3.25}, + {"label":"B", "x":8.25, "y":3.25}, + {"label":"N", "x":9.25, "y":3.25}, + {"label":"M", "x":10.25, "y":3.25}, + {"label":",<", "x":11.25, "y":3.25}, + {"label":".>", "x":12.25, "y":3.25}, + {"label":"/?", "x":13.25, "y":3.25}, + {"label":"Shift", "w":1.75, "x":14.25, "y":3.25}, + {"label":"\u2191", "x":16.25, "y":3.5}, + + {"label":"Ctrl", "w":1.5, "x":0, "y":4.25}, + {"label":"Alt", "w":1.5, "x":3.25, "y":4.25}, + {"label":"Space", "w":2, "x":4.75, "y":4.25}, + {"label":"GUI", "x":6.75, "y":4.25}, + {"label":"Space", "w":2.75, "x":8.75, "y":4.25}, + {"label":"Fn", "w":1.5, "x":11.5, "y":4.25}, + {"label":"\u2190", "x":15.25, "y":4.5}, + {"label":"\u2193", "x":16.25, "y":4.5}, + {"label":"\u2192", "x":17.25, "y":4.5} + ] } } } -- cgit v1.2.3