From fd6449e42cf326bdf17eab118639faa6b0359eb7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 19:27:11 +1000 Subject: Move split space/backspace layouts to data driven (#20356) --- keyboards/skergo/info.json | 306 ++++++++++++++++++++++++--------------------- keyboards/skergo/skergo.h | 65 ---------- 2 files changed, 163 insertions(+), 208 deletions(-) delete mode 100644 keyboards/skergo/skergo.h (limited to 'keyboards/skergo') diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json index 944516fecd..0e68b6aedd 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -21,153 +21,173 @@ "layouts": { "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", "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} + {"matrix": [0, 0], "x": 0.5, "y": 0.25}, + {"matrix": [0, 1], "x": 1.5, "y": 0.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0.25}, + {"matrix": [0, 3], "x": 3.5, "y": 0.25}, + {"matrix": [0, 4], "x": 4.5, "y": 0.25}, + {"matrix": [0, 5], "x": 5.5, "y": 0.25}, + {"matrix": [0, 6], "x": 6.5, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0.25}, + {"matrix": [0, 12], "x": 13.75, "y": 0.25}, + {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2}, + + {"matrix": [1, 14], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.75, "y": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1.25}, + {"matrix": [1, 4], "x": 4.75, "y": 1.25}, + {"matrix": [1, 5], "x": 5.75, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.4, "y": 1.25}, + {"matrix": [1, 7], "x": 9.4, "y": 1.25}, + {"matrix": [1, 8], "x": 10.4, "y": 1.25}, + {"matrix": [1, 9], "x": 11.4, "y": 1.25}, + {"matrix": [1, 10], "x": 12.4, "y": 1.25}, + {"matrix": [1, 11], "x": 13.4, "y": 1.25}, + {"matrix": [1, 12], "x": 14.4, "y": 1.25}, + {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 17.15, "y": 1}, + + {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.9, "y": 2.25}, + {"matrix": [2, 2], "x": 2.9, "y": 2.25}, + {"matrix": [2, 3], "x": 3.9, "y": 2.25}, + {"matrix": [2, 4], "x": 4.9, "y": 2.25}, + {"matrix": [2, 5], "x": 5.9, "y": 2.25}, + + {"matrix": [2, 6], "x": 8.75, "y": 2.25}, + {"matrix": [2, 7], "x": 9.75, "y": 2.25}, + {"matrix": [2, 8], "x": 10.75, "y": 2.25}, + {"matrix": [2, 9], "x": 11.75, "y": 2.25}, + {"matrix": [2, 10], "x": 12.75, "y": 2.25}, + {"matrix": [2, 11], "x": 13.75, "y": 2.25}, + {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25}, + + {"matrix": [3, 14], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + + {"matrix": [4, 6], "x": 8.25, "y": 3.25}, + {"matrix": [3, 6], "x": 9.25, "y": 3.25}, + {"matrix": [3, 7], "x": 10.25, "y": 3.25}, + {"matrix": [3, 8], "x": 11.25, "y": 3.25}, + {"matrix": [3, 9], "x": 12.25, "y": 3.25}, + {"matrix": [3, 10], "x": 13.25, "y": 3.25}, + {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 4.25}, + + {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 4.5}, + {"matrix": [4, 13], "x": 16.25, "y": 4.5}, + {"matrix": [4, 14], "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":"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} + {"matrix": [0, 0], "x": 0.5, "y": 0.25}, + {"matrix": [0, 1], "x": 1.5, "y": 0.25}, + {"matrix": [0, 2], "x": 2.5, "y": 0.25}, + {"matrix": [0, 3], "x": 3.5, "y": 0.25}, + {"matrix": [0, 4], "x": 4.5, "y": 0.25}, + {"matrix": [0, 5], "x": 5.5, "y": 0.25}, + {"matrix": [0, 6], "x": 6.5, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0.25}, + {"matrix": [0, 12], "x": 13.75, "y": 0.25}, + {"matrix": [0, 13], "x": 14.75, "y": 0.25}, + {"matrix": [0, 14], "x": 15.75, "y": 0.25}, + + {"matrix": [1, 14], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.75, "y": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1.25}, + {"matrix": [1, 3], "x": 3.75, "y": 1.25}, + {"matrix": [1, 4], "x": 4.75, "y": 1.25}, + {"matrix": [1, 5], "x": 5.75, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.4, "y": 1.25}, + {"matrix": [1, 7], "x": 9.4, "y": 1.25}, + {"matrix": [1, 8], "x": 10.4, "y": 1.25}, + {"matrix": [1, 9], "x": 11.4, "y": 1.25}, + {"matrix": [1, 10], "x": 12.4, "y": 1.25}, + {"matrix": [1, 11], "x": 13.4, "y": 1.25}, + {"matrix": [1, 12], "x": 14.4, "y": 1.25}, + {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 17.15, "y": 1}, + + {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.9, "y": 2.25}, + {"matrix": [2, 2], "x": 2.9, "y": 2.25}, + {"matrix": [2, 3], "x": 3.9, "y": 2.25}, + {"matrix": [2, 4], "x": 4.9, "y": 2.25}, + {"matrix": [2, 5], "x": 5.9, "y": 2.25}, + + {"matrix": [2, 6], "x": 8.75, "y": 2.25}, + {"matrix": [2, 7], "x": 9.75, "y": 2.25}, + {"matrix": [2, 8], "x": 10.75, "y": 2.25}, + {"matrix": [2, 9], "x": 11.75, "y": 2.25}, + {"matrix": [2, 10], "x": 12.75, "y": 2.25}, + {"matrix": [2, 11], "x": 13.75, "y": 2.25}, + {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25}, + + {"matrix": [3, 14], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + + {"matrix": [4, 6], "x": 8.25, "y": 3.25}, + {"matrix": [3, 6], "x": 9.25, "y": 3.25}, + {"matrix": [3, 7], "x": 10.25, "y": 3.25}, + {"matrix": [3, 8], "x": 11.25, "y": 3.25}, + {"matrix": [3, 9], "x": 12.25, "y": 3.25}, + {"matrix": [3, 10], "x": 13.25, "y": 3.25}, + {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 4.25}, + + {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 4.5}, + {"matrix": [4, 13], "x": 16.25, "y": 4.5}, + {"matrix": [4, 14], "x": 17.25, "y": 4.5} ] } } diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h deleted file mode 100644 index cee1c4c656..0000000000 --- a/keyboards/skergo/skergo.h +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright (C) 2021 Keyz.io Ltd. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -*/ - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -/* ┌───┐ - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐│1E │ ┌───────┐ - * │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │├───┤ │0E │ 2u Backspace - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│2E │ └───────┘ - * │10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │├───┤ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│3E │ - * │20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │└───┘ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ - * │30 │31 │32 │33 │34 │35 │ │46 │36 │37 │38 │39 │3A │3B │┌───┐ - * ├────┬───┴───┼───┴─┬─┴───┴─┬─┴─┐ └─┬─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │ - * │40 │ │42 │44 │45 │ │47 │49 │ ┌───┼───┼───┐ - * └────┘ └─────┴───────┴───┘ └──────────┴─────┘ │4C │4D │4E │ - * └───┴───┴───┘ - * - Position K46 (secondary B key) is optional - */ - -#define LAYOUT_2u_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3E, \ - K30, K31, K32, K33, K34, K35, K46, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K42, K44, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ - { K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E } \ -} - -#define LAYOUT_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3E, \ - K30, K31, K32, K33, K34, K35, K46, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K42, K44, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \ - { K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E } \ -} -- cgit v1.2.3