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/blockey/blockey.h | 45 ----------------------------- keyboards/blockey/info.json | 69 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 46 deletions(-) delete mode 100644 keyboards/blockey/blockey.h (limited to 'keyboards/blockey') diff --git a/keyboards/blockey/blockey.h b/keyboards/blockey/blockey.h deleted file mode 100644 index 7b007a2e97..0000000000 --- a/keyboards/blockey/blockey.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2018 Eucalyn - * - * 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" - -// readability -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k50, k51, k52, k53, k54, k55, k56, \ - k10, k11, k12, k13, k14, k15, k16, k60, k61, k62, k63, k64, k65, k66, \ - k20, k21, k22, k23, k24, k25, k26, k70, k71, k72, k73, k74, k75, \ - k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \ - k40, k41, k42, k43, k46, k93, k94, k95 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, XXX, XXX, k46 }, \ - { k50, k51, k52, k53, k54, k55, k56 }, \ - { k60, k61, k62, k63, k64, k65, k66 }, \ - { k70, k71, k72, k73, k74, k75, XXX }, \ - { k80, k81, k82, k83, k84, k85, XXX }, \ - { XXX, XXX, XXX, k93, k94, k95, XXX } \ -} diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 27aa9f62a1..044d1e9e1a 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -20,7 +20,74 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0}, {"label":"Tab", "x":0.16, "y":1}, {"label":"Q", "x":1.16, "y":1}, {"label":"W", "x":2.16, "y":1}, {"label":"E", "x":3.16, "y":1}, {"label":"R", "x":4.16, "y":1}, {"label":"T", "x":5.16, "y":1}, {"label":"Y", "x":6.16, "y":1}, {"label":"U", "x":7.16, "y":1}, {"label":"I", "x":8.16, "y":1}, {"label":"O", "x":9.16, "y":1}, {"label":"P", "x":10.16, "y":1}, {"label":"[", "x":11.16, "y":1}, {"label":"]", "x":12.16, "y":1}, {"label":"\\", "x":13.16, "y":1}, {"label":"LCtrl", "x":0.33, "y":2}, {"label":"A", "x":1.33, "y":2}, {"label":"S", "x":2.33, "y":2}, {"label":"D", "x":3.33, "y":2}, {"label":"F", "x":4.33, "y":2}, {"label":"G", "x":5.33, "y":2}, {"label":"H", "x":6.33, "y":2}, {"label":"J", "x":7.33, "y":2}, {"label":"K", "x":8.33, "y":2}, {"label":"L", "x":9.33, "y":2}, {"label":";", "x":10.33, "y":2}, {"label":"\"", "x":11.33, "y":2}, {"label":"Enter", "x":12.66, "y":2}, {"label":"LShift", "x":0.5, "y":3}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":",", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"Up", "x":11.5, "y":3}, {"label":"Fn", "x":12.83, "y":3}, {"label":"Esc", "x":0, "y":4}, {"label":"Caps Lock", "x":1, "y":4}, {"label":"LAlt", "x":2, "y":4}, {"label":"LGUI", "x":3, "y":4}, {"label":"Space", "x":4, "y":4, "w":6}, {"label":"Left", "x":10.5, "y":4}, {"label":"Down", "x":11.5, "y":4}, {"label":"Right", "x":12.5, "y":4}] + "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0.16, "y": 1}, + {"matrix": [1, 1], "x": 1.16, "y": 1}, + {"matrix": [1, 2], "x": 2.16, "y": 1}, + {"matrix": [1, 3], "x": 3.16, "y": 1}, + {"matrix": [1, 4], "x": 4.16, "y": 1}, + {"matrix": [1, 5], "x": 5.16, "y": 1}, + {"matrix": [1, 6], "x": 6.16, "y": 1}, + {"matrix": [6, 0], "x": 7.16, "y": 1}, + {"matrix": [6, 1], "x": 8.16, "y": 1}, + {"matrix": [6, 2], "x": 9.16, "y": 1}, + {"matrix": [6, 3], "x": 10.16, "y": 1}, + {"matrix": [6, 4], "x": 11.16, "y": 1}, + {"matrix": [6, 5], "x": 12.16, "y": 1}, + {"matrix": [6, 6], "x": 13.16, "y": 1}, + + {"matrix": [2, 0], "x": 0.33, "y": 2}, + {"matrix": [2, 1], "x": 1.33, "y": 2}, + {"matrix": [2, 2], "x": 2.33, "y": 2}, + {"matrix": [2, 3], "x": 3.33, "y": 2}, + {"matrix": [2, 4], "x": 4.33, "y": 2}, + {"matrix": [2, 5], "x": 5.33, "y": 2}, + {"matrix": [2, 6], "x": 6.33, "y": 2}, + {"matrix": [7, 0], "x": 7.33, "y": 2}, + {"matrix": [7, 1], "x": 8.33, "y": 2}, + {"matrix": [7, 2], "x": 9.33, "y": 2}, + {"matrix": [7, 3], "x": 10.33, "y": 2}, + {"matrix": [7, 4], "x": 11.33, "y": 2}, + {"matrix": [7, 5], "x": 12.66, "y": 2}, + + {"matrix": [3, 0], "x": 0.5, "y": 3}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [8, 0], "x": 7.5, "y": 3}, + {"matrix": [8, 1], "x": 8.5, "y": 3}, + {"matrix": [8, 2], "x": 9.5, "y": 3}, + {"matrix": [8, 3], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 5], "x": 12.83, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"matrix": [9, 3], "x": 10.5, "y": 4}, + {"matrix": [9, 4], "x": 11.5, "y": 4}, + {"matrix": [9, 5], "x": 12.5, "y": 4} + ] } } } -- cgit v1.2.3