From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/fr4/southpaw75/info.json | 85 ++++++++++++++++++++++++++++++++++- keyboards/fr4/southpaw75/southpaw75.h | 37 --------------- 2 files changed, 84 insertions(+), 38 deletions(-) delete mode 100644 keyboards/fr4/southpaw75/southpaw75.h (limited to 'keyboards/fr4') diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json index 77949825fb..066af0b9a7 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/info.json @@ -17,7 +17,90 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"~", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0, "w":2}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"Enter", "x":16.75, "y":2, "w":2.25}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"Shift", "x":4, "y":3, "w":2.25}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":2.75}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Ctrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"Alt", "x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":6.25}, {"label":"Alt", "x":14, "y":4, "w":1.25}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Menu", "x":16.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [1, 7], "x": 16, "y": 0}, + {"matrix": [1, 8], "x": 17, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [2, 4], "x": 4, "y": 1, "w": 1.5}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 0], "x": 9.5, "y": 1}, + {"matrix": [3, 1], "x": 10.5, "y": 1}, + {"matrix": [3, 2], "x": 11.5, "y": 1}, + {"matrix": [3, 3], "x": 12.5, "y": 1}, + {"matrix": [3, 4], "x": 13.5, "y": 1}, + {"matrix": [3, 5], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [3, 8], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [4, 4], "x": 5.75, "y": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 2}, + {"matrix": [4, 7], "x": 8.75, "y": 2}, + {"matrix": [4, 8], "x": 9.75, "y": 2}, + {"matrix": [5, 0], "x": 10.75, "y": 2}, + {"matrix": [5, 1], "x": 11.75, "y": 2}, + {"matrix": [5, 2], "x": 12.75, "y": 2}, + {"matrix": [5, 3], "x": 13.75, "y": 2}, + {"matrix": [5, 4], "x": 14.75, "y": 2}, + {"matrix": [5, 5], "x": 15.75, "y": 2}, + {"matrix": [5, 6], "x": 16.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 7], "x": 0, "y": 3}, + {"matrix": [5, 8], "x": 1, "y": 3}, + {"matrix": [6, 0], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3, "h": 2}, + {"matrix": [6, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [6, 4], "x": 7.25, "y": 3}, + {"matrix": [6, 5], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 7], "x": 10.25, "y": 3}, + {"matrix": [6, 8], "x": 11.25, "y": 3}, + {"matrix": [7, 0], "x": 12.25, "y": 3}, + {"matrix": [7, 1], "x": 13.25, "y": 3}, + {"matrix": [7, 2], "x": 14.25, "y": 3}, + {"matrix": [7, 3], "x": 15.25, "y": 3}, + {"matrix": [7, 4], "x": 16.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 5], "x": 0, "y": 4, "w": 2}, + {"matrix": [7, 6], "x": 2, "y": 4}, + {"matrix": [7, 7], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [7, 8], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [8, 2], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 16.5, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 17.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/fr4/southpaw75/southpaw75.h b/keyboards/fr4/southpaw75/southpaw75.h deleted file mode 100644 index 7842d8ea90..0000000000 --- a/keyboards/fr4/southpaw75/southpaw75.h +++ /dev/null @@ -1,37 +0,0 @@ - /* - Copyright 2020 Kelvin Hall - - 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 2 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 LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, K35, K36, K37, K38, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K50, K51, K52, K53, K54, K55, K56, \ - K57, K58, K60, K61, K62, K63, K64, K65, K66, K67, K68, K70, K71, K72, K73, K74, \ - K75, K76, K77, K78, K80, K81, K82, K83, K84, K85 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO } \ -} -- cgit v1.2.3