From a84528f85392ccab60fd7130fecb83972539367f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:07:32 +1000 Subject: Move remaining `LAYOUT`s to data driven (#20422) --- keyboards/buzzard/rev1/info.json | 94 +++++++++++++++++++++++++++++++++++++++- keyboards/buzzard/rev1/rev1.c | 2 +- keyboards/buzzard/rev1/rev1.h | 52 ---------------------- 3 files changed, 94 insertions(+), 54 deletions(-) delete mode 100644 keyboards/buzzard/rev1/rev1.h (limited to 'keyboards/buzzard/rev1') diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json index 3cd9d387ca..78479a8dd2 100644 --- a/keyboards/buzzard/rev1/info.json +++ b/keyboards/buzzard/rev1/info.json @@ -20,7 +20,99 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "layout": [ + {"matrix": [0, 4], "x": 1, "y": 0}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0}, + {"matrix": [0, 0], "x": 5, "y": 0}, + + {"matrix": [4, 0], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 3], "x": 14, "y": 0}, + {"matrix": [4, 4], "x": 15, "y": 0}, + + {"matrix": [1, 5], "x": 0, "y": 1}, + {"matrix": [1, 4], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1}, + {"matrix": [1, 0], "x": 5, "y": 1}, + + {"matrix": [5, 0], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1}, + {"matrix": [5, 3], "x": 14, "y": 1}, + {"matrix": [5, 4], "x": 15, "y": 1}, + {"matrix": [5, 5], "x": 16, "y": 1}, + + {"matrix": [2, 5], "x": 0, "y": 2}, + {"matrix": [2, 4], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2}, + {"matrix": [2, 0], "x": 5, "y": 2}, + + {"matrix": [6, 0], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2}, + {"matrix": [6, 3], "x": 14, "y": 2}, + {"matrix": [6, 4], "x": 15, "y": 2}, + {"matrix": [6, 5], "x": 16, "y": 2}, + + {"matrix": [3, 2], "x": 5, "y": 3}, + {"matrix": [3, 1], "x": 6, "y": 3}, + {"matrix": [3, 0], "x": 7, "y": 3}, + + {"matrix": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 1], "x": 10, "y": 3}, + {"matrix": [7, 2], "x": 11, "y": 3} + ] + }, + "LAYOUT_stack": { + "layout": [ + {"matrix": [0, 4], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 4], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [1, 2], "x": 8, "y": 0}, + {"matrix": [1, 1], "x": 9, "y": 0}, + {"matrix": [1, 0], "x": 10, "y": 0}, + {"matrix": [2, 5], "x": 11, "y": 0}, + {"matrix": [2, 4], "x": 12, "y": 0}, + {"matrix": [2, 3], "x": 13, "y": 0}, + {"matrix": [2, 2], "x": 14, "y": 0}, + {"matrix": [2, 1], "x": 15, "y": 0}, + {"matrix": [2, 0], "x": 16, "y": 0}, + {"matrix": [3, 2], "x": 17, "y": 0}, + {"matrix": [3, 1], "x": 18, "y": 0}, + {"matrix": [3, 0], "x": 19, "y": 0}, + {"matrix": [4, 0], "x": 20, "y": 0}, + {"matrix": [4, 1], "x": 21, "y": 0}, + {"matrix": [4, 2], "x": 22, "y": 0}, + {"matrix": [4, 3], "x": 23, "y": 0}, + {"matrix": [4, 4], "x": 24, "y": 0}, + {"matrix": [5, 0], "x": 25, "y": 0}, + {"matrix": [5, 1], "x": 26, "y": 0}, + {"matrix": [5, 2], "x": 27, "y": 0}, + {"matrix": [5, 3], "x": 28, "y": 0}, + {"matrix": [5, 4], "x": 29, "y": 0}, + {"matrix": [5, 5], "x": 30, "y": 0}, + {"matrix": [6, 0], "x": 31, "y": 0}, + {"matrix": [6, 1], "x": 32, "y": 0}, + {"matrix": [6, 2], "x": 33, "y": 0}, + {"matrix": [6, 3], "x": 34, "y": 0}, + {"matrix": [6, 4], "x": 35, "y": 0}, + {"matrix": [6, 5], "x": 36, "y": 0}, + {"matrix": [7, 0], "x": 37, "y": 0}, + {"matrix": [7, 1], "x": 38, "y": 0}, + {"matrix": [7, 2], "x": 39, "y": 0} + ] } } } \ No newline at end of file diff --git a/keyboards/buzzard/rev1/rev1.c b/keyboards/buzzard/rev1/rev1.c index 0124a92c32..c6cdc66187 100644 --- a/keyboards/buzzard/rev1/rev1.c +++ b/keyboards/buzzard/rev1/rev1.c @@ -1,6 +1,6 @@ // Copyright 2021 Christoph Rehmann (crehmann) // SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" +#include "quantum.h" #ifdef HAPTIC_ENABLE #include "drivers/haptic/DRV2605L.h" diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h deleted file mode 100644 index 74c5fef08e..0000000000 --- a/keyboards/buzzard/rev1/rev1.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2021 Christoph Rehmann (crehmann) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R20, R21, \ - L22, L23, L24, L25, L26, L27, R28, R29, R30, R31, R32, R33, \ - L34, L35, L36, R37, R38, R39 \ -) \ -{ \ - { L04, L03, L02, L01, L00, KC_NO }, \ - { L15, L14, L13, L12, L11, L10 }, \ - { L27, L26, L25, L24, L23, L22 }, \ - { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \ - { R05, R06, R07, R08, R09, KC_NO }, \ - { R16, R17, R18, R19, R20, R21 }, \ - { R28, R29, R30, R31, R32, R33 }, \ - { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \ -} - -#define LAYOUT_stack( \ - L00, L01, L02, L03, L04, \ - L10, L11, L12, L13, L14, L15, \ - L22, L23, L24, L25, L26, L27, \ - L34, L35, L36, \ - \ - R05, R06, R07, R08, R09, \ - R16, R17, R18, R19, R20, R21, \ - R28, R29, R30, R31, R32, R33, \ - R37, R38, R39 \ -) \ -{ \ - { L04, L03, L02, L01, L00, KC_NO }, \ - { L15, L14, L13, L12, L11, L10 }, \ - { L27, L26, L25, L24, L23, L22 }, \ - { L36, L35, L34, KC_NO, KC_NO, KC_NO }, \ - { R05, R06, R07, R08, R09, KC_NO }, \ - { R16, R17, R18, R19, R20, R21 }, \ - { R28, R29, R30, R31, R32, R33 }, \ - { R37, R38, R39, KC_NO, KC_NO, KC_NO }, \ -} -- cgit v1.2.3