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/lazydesigners/bolt/bolt.h | 32 --------- keyboards/lazydesigners/bolt/info.json | 95 +++++++++++++------------- keyboards/lazydesigners/the50/info.json | 116 +++++++++++++++++--------------- keyboards/lazydesigners/the50/the50.h | 26 ------- 4 files changed, 111 insertions(+), 158 deletions(-) delete mode 100644 keyboards/lazydesigners/bolt/bolt.h (limited to 'keyboards/lazydesigners') diff --git a/keyboards/lazydesigners/bolt/bolt.h b/keyboards/lazydesigners/bolt/bolt.h deleted file mode 100644 index 412ed7b099..0000000000 --- a/keyboards/lazydesigners/bolt/bolt.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 LAZYDESIGNERS - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K311, \ - K300, K301, K303, K304, K306, K307, K308, K309, K310 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, KC_NO, K303, K304, KC_NO, K306, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json index 4a6755f5d5..a12226cf51 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/info.json @@ -21,52 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K000 (F0,F1)", "x":0, "y":0}, - {"label":"K001 (F0,F4)", "x":1, "y":0}, - {"label":"K002 (F0,F5)", "x":2, "y":0}, - {"label":"K003 (F0,F6)", "x":3, "y":0}, - {"label":"K004 (F0,F7)", "x":4, "y":0}, - {"label":"K005 (F0,C6)", "x":5, "y":0}, - {"label":"K006 (F0,B3)", "x":7.5, "y":0}, - {"label":"K007 (F0,B7)", "x":8.5, "y":0}, - {"label":"K008 (F0,D0)", "x":9.5, "y":0}, - {"label":"K009 (F0,D3)", "x":10.5, "y":0}, - {"label":"K010 (F0,D2)", "x":11.5, "y":0}, - {"label":"K011 (F0,D1)", "x":12.5, "y":0, "w":1.75}, - {"label":"K100 (C7,F1)", "x":0, "y":1, "w":1.25}, - {"label":"K101 (C7,F4)", "x":1.25, "y":1}, - {"label":"K102 (C7,F5)", "x":2.25, "y":1}, - {"label":"K103 (C7,F6)", "x":3.25, "y":1}, - {"label":"K104 (C7,F7)", "x":4.25, "y":1}, - {"label":"K105 (C7,C6)", "x":5.25, "y":1}, - {"label":"K106 (C7,B3)", "x":7.75, "y":1}, - {"label":"K107 (C7,B7)", "x":8.75, "y":1}, - {"label":"K108 (C7,D0)", "x":9.75, "y":1}, - {"label":"K109 (C7,D3)", "x":10.75, "y":1}, - {"label":"K110 (C7,D2)", "x":11.75, "y":1}, - {"label":"K111 (C7,D1)", "x":12.75, "y":1, "w":1.5}, - {"label":"K200 (B6,F1)", "x":0, "y":2, "w":1.75}, - {"label":"K201 (B6,F4)", "x":1.75, "y":2}, - {"label":"K202 (B6,F5)", "x":2.75, "y":2}, - {"label":"K203 (B6,F6)", "x":3.75, "y":2}, - {"label":"K204 (B6,F7)", "x":4.75, "y":2}, - {"label":"K205 (B6,C6)", "x":5.75, "y":2}, - {"label":"K206 (B6,B3)", "x":7.25, "y":2}, - {"label":"K207 (B6,B7)", "x":8.25, "y":2}, - {"label":"K208 (B6,D0)", "x":9.25, "y":2}, - {"label":"K209 (B6,D3)", "x":10.25, "y":2}, - {"label":"K210 (B6,D2)", "x":11.25, "y":2}, - {"label":"K211 (B6,D1)", "x":12.25, "y":2}, - {"label":"K311 (D5,D1)", "x":13.25, "y":2}, - {"label":"K300 (D5,F1)", "x":0, "y":3, "w":1.25}, - {"label":"K301 (D5,F4)", "x":1.25, "y":3, "w":1.25}, - {"label":"K303 (D5,F6)", "x":3.25, "y":3, "w":1.25}, - {"label":"K304 (D5,F7)", "x":4.5, "y":3, "w":2.25}, - {"label":"K306 (D5,B3)", "x":7.25, "y":3, "w":2.25}, - {"label":"K307 (D5,B7)", "x":9.5, "y":3}, - {"label":"K308 (D5,D0)", "x":11.25, "y":3}, - {"label":"K309 (D5,D3)", "x":12.25, "y":3}, - {"label":"K310 (D5,D2)", "x":13.25, "y":3} + {"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": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [3, 11], "x": 13.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3} ] } } diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index 3b8f808e4d..a82f180e57 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -25,60 +25,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Back
Space", "x":11, "y":0}, - {"label":"7", "x":12.25, "y":0}, - {"label":"8", "x":13.25, "y":0}, - {"label":"9", "x":14.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"Enter", "x":10.25, "y":1, "w":1.75}, - {"label":"4", "x":12.25, "y":1}, - {"label":"5", "x":13.25, "y":1}, - {"label":"6", "x":14.25, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":">", "x":9.75, "y":2}, - {"label":"Fn", "x":10.75, "y":2, "w":1.25}, - {"label":"1", "x":12.25, "y":2}, - {"label":"2", "x":13.25, "y":2}, - {"label":"3", "x":14.25, "y":2}, - {"label":"Hyper", "x":0, "y":3, "w":1.25}, - {"label":"Super", "x":1.25, "y":3}, - {"label":"Meta", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":5.75, "y":3, "w":2.75}, - {"label":"Meta", "x":8.5, "y":3, "w":1.25}, - {"label":"Super", "x":9.75, "y":3}, - {"label":"Hyper", "x":10.75, "y":3, "w":1.25}, - {"label":"0", "x":12.25, "y":3}, - {"label":".", "x":13.25, "y":3}, - {"label":"Enter", "x":14.25, "y":3}] + {"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": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [1, 12], "x": 12.25, "y": 1}, + {"matrix": [1, 13], "x": 13.25, "y": 1}, + {"matrix": [1, 14], "x": 14.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 14], "x": 14.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3}, + {"matrix": [3, 14], "x": 14.25, "y": 3} + ] } } } diff --git a/keyboards/lazydesigners/the50/the50.h b/keyboards/lazydesigners/the50/the50.h index 1cf613aada..e796e9161c 100644 --- a/keyboards/lazydesigners/the50/the50.h +++ b/keyboards/lazydesigners/the50/the50.h @@ -2,31 +2,5 @@ #include "quantum.h" -#define XXXX KC_NO - -/* - * ,-----------------------------------------------------------. ,--------------. - * | | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------' `--------------' - */ - -#define LAYOUT( \ -K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, K112, K113, K114, \ -K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ -K300, K301, K302, K304, K307, K309, K310, K311, K312, K313, K314 \ -) { \ -{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ -{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, XXXX, K111, K112, K113, K114 }, \ -{ K200, XXXX, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ -{ K300, K301, K302, XXXX, K304, XXXX, XXXX, K307, XXXX, K309, K310, K311, K312, K313, K314 } \ -} - void the50_led_on(void); void the50_led_off(void); -- cgit v1.2.3