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/gboards/gergo/gergo.h | 25 --- keyboards/gboards/gergo/info.json | 321 +++++++------------------------------- 2 files changed, 57 insertions(+), 289 deletions(-) (limited to 'keyboards/gboards/gergo') diff --git a/keyboards/gboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h index 9044b374e3..ea6368e2f1 100644 --- a/keyboards/gboards/gergo/gergo.h +++ b/keyboards/gboards/gergo/gergo.h @@ -25,28 +25,3 @@ extern i2c_status_t mcp23018_status; #define OLATB 0x15 uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25,L26,L30, R30,R20,R21,R22,R23,R24,R25,R26, \ - L31,L32,L33,L34, R31,R32,R33,R34) \ - /* matrix positions */ \ - { \ - { KC_NO, L16, L26, L30}, \ - { L05, L15, L25, L34}, \ - { L04, L14, L24, L33}, \ - { L03, L13, L23, L32}, \ - { L02, L12, L22, L31}, \ - { L01, L11, L21, KC_NO}, \ - { L00, L10, L20, KC_NO}, \ - \ - { KC_NO, R10, R20, R30}, \ - { R00, R11, R21, R31}, \ - { R01, R12, R22, R32}, \ - { R02, R13, R23, R33}, \ - { R03, R14, R24, R34}, \ - { R04, R15, R25, KC_NO}, \ - { R05, R16, R26, KC_NO}, \ -} diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index 5aadadbaed..53711cb271 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -19,270 +19,63 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "L00", - "w": 1.5, - "x": 0, - "y": 0.38 - }, - { - "label": "L01", - "x": 1.5, - "y": 0.38 - }, - { - "label": "L02", - "x": 2.5, - "y": 0.13 - }, - { - "label": "L03", - "x": 3.5, - "y": 0 - }, - { - "label": "L04", - "x": 4.5, - "y": 0.13 - }, - { - "label": "L05", - "x": 5.5, - "y": 0.25 - }, - { - "label": "R00", - "x": 13, - "y": 0.25 - }, - { - "label": "R01", - "x": 14, - "y": 0.13 - }, - { - "label": "R02", - "x": 15, - "y": 0 - }, - { - "label": "R03", - "x": 16, - "y": 0.13 - }, - { - "label": "R04", - "x": 17, - "y": 0.38 - }, - { - "label": "R05", - "w": 1.5, - "x": 18, - "y": 0.38 - }, - { - "label": "L10", - "w": 1.5, - "x": 0, - "y": 1.3800000000000001 - }, - { - "label": "L11", - "x": 1.5, - "y": 1.3800000000000001 - }, - { - "label": "L12", - "x": 2.5, - "y": 1.1300000000000001 - }, - { - "label": "L13", - "x": 3.5, - "y": 1 - }, - { - "label": "L14", - "x": 4.5, - "y": 1.1300000000000001 - }, - { - "label": "L15", - "x": 5.5, - "y": 1.25 - }, - { - "h": 1.5, - "label": "L16", - "x": 6.5, - "y": 0.25 - }, - { - "h": 1.5, - "label": "R10", - "x": 12, - "y": 0.25 - }, - { - "label": "R11", - "x": 13, - "y": 1.25 - }, - { - "label": "R12", - "x": 14, - "y": 1.1300000000000001 - }, - { - "label": "R13", - "x": 15, - "y": 1 - }, - { - "label": "R14", - "x": 16, - "y": 1.1300000000000001 - }, - { - "label": "R15", - "x": 17, - "y": 1.3800000000000001 - }, - { - "label": "R16", - "w": 1.5, - "x": 18, - "y": 1.3800000000000001 - }, - { - "label": "L20", - "w": 1.5, - "x": 0, - "y": 2.38 - }, - { - "label": "L21", - "x": 1.5, - "y": 2.38 - }, - { - "label": "L22", - "x": 2.5, - "y": 2.13 - }, - { - "label": "L23", - "x": 3.5, - "y": 2 - }, - { - "label": "L24", - "x": 4.5, - "y": 2.13 - }, - { - "label": "L25", - "x": 5.5, - "y": 2.25 - }, - { - "h": 1.5, - "label": "L26", - "x": 6.5, - "y": 1.75 - }, - { - "label": "L30", - "x": 8.25, - "y": 2.75 - }, - { - "label": "R30", - "x": 10.25, - "y": 2.75 - }, - { - "h": 1.5, - "label": "R20", - "x": 12, - "y": 1.75 - }, - { - "label": "R21", - "x": 13, - "y": 2.25 - }, - { - "label": "R22", - "x": 14, - "y": 2.13 - }, - { - "label": "R23", - "x": 15, - "y": 2 - }, - { - "label": "R24", - "x": 16, - "y": 2.13 - }, - { - "label": "R25", - "x": 17, - "y": 2.38 - }, - { - "label": "R26", - "w": 1.5, - "x": 18, - "y": 2.38 - }, - { - "label": "L31", - "x": 4.75, - "y": 3.25 - }, - { - "label": "L32", - "x": 6, - "y": 3.63 - }, - { - "h": 2, - "label": "L33", - "x": 7.25, - "y": 3.75 - }, - { - "h": 2, - "label": "L34", - "x": 8.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R31", - "x": 10.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R32", - "x": 11.25, - "y": 3.75 - }, - { - "label": "R33", - "x": 12.5, - "y": 3.63 - }, - { - "label": "R34", - "x": 13.75, - "y": 3.25 - } + {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 0.38}, + {"matrix": [4, 0], "x": 2.5, "y": 0.13}, + {"matrix": [3, 0], "x": 3.5, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0.13}, + {"matrix": [1, 0], "x": 5.5, "y": 0.25}, + + {"matrix": [8, 0], "x": 13, "y": 0.25}, + {"matrix": [9, 0], "x": 14, "y": 0.13}, + {"matrix": [10, 0], "x": 15, "y": 0}, + {"matrix": [11, 0], "x": 16, "y": 0.13}, + {"matrix": [12, 0], "x": 17, "y": 0.38}, + {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5}, + + {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 1.38}, + {"matrix": [4, 1], "x": 2.5, "y": 1.13}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 1], "x": 4.5, "y": 1.13}, + {"matrix": [1, 1], "x": 5.5, "y": 1.25}, + {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5}, + + {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5}, + {"matrix": [8, 1], "x": 13, "y": 1.25}, + {"matrix": [9, 1], "x": 14, "y": 1.13}, + {"matrix": [10, 1], "x": 15, "y": 1}, + {"matrix": [11, 1], "x": 16, "y": 1.13}, + {"matrix": [12, 1], "x": 17, "y": 1.38}, + {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5}, + + {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5}, + {"matrix": [5, 2], "x": 1.5, "y": 2.38}, + {"matrix": [4, 2], "x": 2.5, "y": 2.13}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2.13}, + {"matrix": [1, 2], "x": 5.5, "y": 2.25}, + {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5}, + {"matrix": [0, 3], "x": 8.25, "y": 2.75}, + + {"matrix": [7, 3], "x": 10.25, "y": 2.75}, + {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5}, + {"matrix": [8, 2], "x": 13, "y": 2.25}, + {"matrix": [9, 2], "x": 14, "y": 2.13}, + {"matrix": [10, 2], "x": 15, "y": 2}, + {"matrix": [11, 2], "x": 16, "y": 2.13}, + {"matrix": [12, 2], "x": 17, "y": 2.38}, + {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5}, + + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 3], "x": 6, "y": 3.63}, + {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2}, + {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2}, + + {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2}, + {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2}, + {"matrix": [10, 3], "x": 12.5, "y": 3.63}, + {"matrix": [11, 3], "x": 13.75, "y": 3.25} ] } } -- cgit v1.2.3