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/yosino58/rev1/info.json | 76 ++++++++++++++++++++++++++++++++++++--- keyboards/yosino58/rev1/rev1.h | 23 ------------ 2 files changed, 71 insertions(+), 28 deletions(-) delete mode 100644 keyboards/yosino58/rev1/rev1.h (limited to 'keyboards/yosino58') diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index 0e8431cc88..40ceef8705 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -24,11 +24,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0.25}, {"x":5, "y":0.5}, {"x":10.75, "y":0.5}, {"x":11.75, "y":0.25}, {"x":12.75, "y":0}, {"x":13.75, "y":0.25}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1.25}, {"x":5, "y":1.5}, {"x":10.75, "y":1.5}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1}, {"x":13.75, "y":1.25}, {"x":14.75, "y":2}, {"x":15.75, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2.25}, {"x":5, "y":2.5}, {"x":10.75, "y":2.5}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2}, {"x":13.75, "y":2.25}, {"x":14.75, "y":3}, {"x":15.75, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3.25}, {"x":5, "y":3.5}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25, "h":2}, {"x":8.5, "y":4.25, "h":2}, {"x":9.5, "y":4.25}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3}, {"x":13.75, "y":3.25}, {"x":14.75, "y":4}, {"x":15.75, "y":4}, - {"x":3.75, "y":4.25}, {"x":4.75, "y":4.5}, {"x":6.5, "y":5.25}, {"x":9.5, "y":5.25}, {"x":11, "y":4.5}, {"x":12, "y":4.25} + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + + {"matrix": [5, 5], "x": 10.75, "y": 0.5}, + {"matrix": [5, 4], "x": 11.75, "y": 0.25}, + {"matrix": [5, 3], "x": 12.75, "y": 0}, + {"matrix": [5, 2], "x": 13.75, "y": 0.25}, + {"matrix": [5, 1], "x": 14.75, "y": 1}, + {"matrix": [5, 0], "x": 15.75, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + + {"matrix": [6, 5], "x": 10.75, "y": 1.5}, + {"matrix": [6, 4], "x": 11.75, "y": 1.25}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 2], "x": 13.75, "y": 1.25}, + {"matrix": [6, 1], "x": 14.75, "y": 2}, + {"matrix": [6, 0], "x": 15.75, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [7, 5], "x": 10.75, "y": 2.5}, + {"matrix": [7, 4], "x": 11.75, "y": 2.25}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2.25}, + {"matrix": [7, 1], "x": 14.75, "y": 3}, + {"matrix": [7, 0], "x": 15.75, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + + {"matrix": [4, 4], "x": 6.5, "y": 4.25}, + {"matrix": [4, 5], "x": 7.5, "y": 4.25, "h": 2}, + + {"matrix": [9, 5], "x": 8.5, "y": 4.25, "h": 2}, + {"matrix": [9, 4], "x": 9.5, "y": 4.25}, + + {"matrix": [8, 5], "x": 10.75, "y": 3.5}, + {"matrix": [8, 4], "x": 11.75, "y": 3.25}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 2], "x": 13.75, "y": 3.25}, + {"matrix": [8, 1], "x": 14.75, "y": 4}, + {"matrix": [8, 0], "x": 15.75, "y": 4}, + + {"matrix": [4, 1], "x": 3.75, "y": 4.25}, + {"matrix": [4, 2], "x": 4.75, "y": 4.5}, + + {"matrix": [4, 3], "x": 6.5, "y": 5.25}, + + {"matrix": [9, 3], "x": 9.5, "y": 5.25}, + + {"matrix": [9, 2], "x": 11, "y": 4.5}, + {"matrix": [9, 1], "x": 12, "y": 4.25} ] } } diff --git a/keyboards/yosino58/rev1/rev1.h b/keyboards/yosino58/rev1/rev1.h deleted file mode 100644 index c643c9d729..0000000000 --- a/keyboards/yosino58/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, LT5, RT5, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, RT1,RT2, RT3, RT4, RT5 }, \ - } -- cgit v1.2.3