From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/ergoslab/rev1/info.json | 113 ++++++++++++++++++++------------------ keyboards/ergoslab/rev1/rev1.c | 2 +- keyboards/ergoslab/rev1/rev1.h | 22 -------- 3 files changed, 62 insertions(+), 75 deletions(-) delete mode 100644 keyboards/ergoslab/rev1/rev1.h (limited to 'keyboards/ergoslab') diff --git a/keyboards/ergoslab/rev1/info.json b/keyboards/ergoslab/rev1/info.json index 5f00b666d1..d786799810 100644 --- a/keyboards/ergoslab/rev1/info.json +++ b/keyboards/ergoslab/rev1/info.json @@ -24,58 +24,67 @@ "layouts": { "LAYOUT_ergoslab": { "layout": [ - {"label":"Q", "x":0, "y":0.625}, - {"label":"W", "x":1, "y":0.125}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.125}, - {"label":"T", "x":4, "y":0.25}, - {"label":"Y", "x":8, "y":0.25}, - {"label":"U", "x":9, "y":0.125}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0.125}, - {"label":"P", "x":12, "y":0.625}, - {"label":"A", "x":0, "y":1.625}, - {"label":"S", "x":1, "y":1.125}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.125}, - {"label":"G", "x":4, "y":1.25}, - {"label":"H", "x":8, "y":1.25}, - {"label":"J", "x":9, "y":1.125}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1.125}, - {"label":";", "x":12, "y":1.625}, - {"label":"Z", "x":0, "y":2.625}, - {"label":"X", "x":1, "y":2.125}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.125}, - {"label":"B", "x":4, "y":2.25}, - {"label":"N", "x":8, "y":2.25}, - {"label":"M", "x":9, "y":2.125}, - {"label":",", "x":10, "y":2}, - {"label":".", "x":11, "y":2.125}, - {"label":"/", "x":12, "y":2.625}, - {"label":"'", "x":0, "y":3.625}, - {"label":"Alt", "x":1, "y":3.125}, - {"label":"Del", "x":2, "y":3}, - {"label":"Enter", "x":3, "y":3.125}, - {"label":"Shift", "x":4, "y":3.25}, - {"label":"Ctrl", "x":5, "y":3.25}, - {"label":"Numb", "x":7, "y":3.25}, - {"label":"Space", "x":8, "y":3.25}, - {"label":"Left", "x":9, "y":3.125}, - {"label":"Down", "x":10, "y":3}, - {"label":"Up", "x":11, "y":3.125}, - {"label":"Right", "x":12, "y":3.625}, - {"label":"[", "x":1, "y":4.25}, - {"label":"(", "x":2, "y":4.25}, - {"label":"Esc", "x":3, "y":4.25}, - {"label":"Media", "x":4, "y":4.25}, - {"label":"GUI", "x":5, "y":4.25}, - {"label":"Tab", "x":7, "y":4.25}, - {"label":"Mouse", "x":8, "y":4.25}, - {"label":"Bspc", "x":9, "y":4.25}, - {"label":")", "x":10, "y":4.25}, - {"label":"]", "x":11, "y":4.25} + {"matrix": [0, 0], "x": 0, "y": 0.625}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [5, 4], "x": 8, "y": 0.25}, + {"matrix": [5, 3], "x": 9, "y": 0.125}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0.125}, + {"matrix": [5, 0], "x": 12, "y": 0.625}, + + {"matrix": [1, 0], "x": 0, "y": 1.625}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [6, 4], "x": 8, "y": 1.25}, + {"matrix": [6, 3], "x": 9, "y": 1.125}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1.125}, + {"matrix": [6, 0], "x": 12, "y": 1.625}, + + {"matrix": [2, 0], "x": 0, "y": 2.625}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [7, 4], "x": 8, "y": 2.25}, + {"matrix": [7, 3], "x": 9, "y": 2.125}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2.125}, + {"matrix": [7, 0], "x": 12, "y": 2.625}, + + {"matrix": [3, 0], "x": 0, "y": 3.625}, + {"matrix": [3, 1], "x": 1, "y": 3.125}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.125}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [8, 5], "x": 7, "y": 3.25}, + {"matrix": [8, 4], "x": 8, "y": 3.25}, + {"matrix": [8, 3], "x": 9, "y": 3.125}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 1], "x": 11, "y": 3.125}, + {"matrix": [8, 0], "x": 12, "y": 3.625}, + + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.25}, + + {"matrix": [9, 5], "x": 7, "y": 4.25}, + {"matrix": [9, 4], "x": 8, "y": 4.25}, + {"matrix": [9, 3], "x": 9, "y": 4.25}, + {"matrix": [9, 2], "x": 10, "y": 4.25}, + {"matrix": [9, 1], "x": 11, "y": 4.25} ] } } diff --git a/keyboards/ergoslab/rev1/rev1.c b/keyboards/ergoslab/rev1/rev1.c index 115dab51e4..104bb39c39 100644 --- a/keyboards/ergoslab/rev1/rev1.c +++ b/keyboards/ergoslab/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/ergoslab/rev1/rev1.h b/keyboards/ergoslab/rev1/rev1.h deleted file mode 100644 index d7fd53a31e..0000000000 --- a/keyboards/ergoslab/rev1/rev1.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ergoslab( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L41, L42, L43, L44, L45, R45, R44, R43, R42, R41 \ -) { \ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, L41, L42, L43, L44, L45 }, \ - { R00, R01, R02, R03, R04, KC_NO }, \ - { R10, R11, R12, R13, R14, KC_NO }, \ - { R20, R21, R22, R23, R24, KC_NO }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, R45 } \ - } -- cgit v1.2.3