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/hillside/52/0_1/0_1.c | 2 +- keyboards/hillside/52/0_1/0_1.h | 39 ---------------------- keyboards/hillside/52/0_1/info.json | 65 +++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 40 deletions(-) delete mode 100644 keyboards/hillside/52/0_1/0_1.h (limited to 'keyboards/hillside/52/0_1') diff --git a/keyboards/hillside/52/0_1/0_1.c b/keyboards/hillside/52/0_1/0_1.c index 9a9808da8c..e305625616 100644 --- a/keyboards/hillside/52/0_1/0_1.c +++ b/keyboards/hillside/52/0_1/0_1.c @@ -1,7 +1,7 @@ // Copyright 2022 Michael McCoyd (@mmccoyd) // SPDX-License-Identifier: GPL-2.0-or-later -#include "0_1.h" +#include "quantum.h" // Keymatrix spots to ignore, as one signals handedness and others have no key const matrix_row_t matrix_mask[] = { diff --git a/keyboards/hillside/52/0_1/0_1.h b/keyboards/hillside/52/0_1/0_1.h deleted file mode 100644 index f09d896938..0000000000 --- a/keyboards/hillside/52/0_1/0_1.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2021 Michael McCoyd (@mmccoyd) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a mapping so keymap files can be more readable to humans. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts those identifiers into a two-dimensional array which - * represents the switch matrix. - * - * The identifiers could be anything, but for human sanity have the folowing form - * - */ - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, LT5, RT5, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1, R32, R31, R30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, RT1, RT2, RT3, RT4, RT5 } \ - } -// clang-format on diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index de6c4e0a80..46ab70bb9b 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -44,5 +44,70 @@ }, "ws2812": { "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.13}, + {"matrix": [0, 1], "x": 1, "y": 0.93}, + {"matrix": [0, 2], "x": 2.1, "y": 0.31}, + {"matrix": [0, 3], "x": 3.2, "y": 0}, + {"matrix": [0, 4], "x": 4.2, "y": 0.28}, + {"matrix": [0, 5], "x": 5.2, "y": 0.42}, + + {"matrix": [5, 5], "x": 9.7, "y": 0.42}, + {"matrix": [5, 4], "x": 10.7, "y": 0.28}, + {"matrix": [5, 3], "x": 11.7, "y": 0}, + {"matrix": [5, 2], "x": 12.8, "y": 0.31}, + {"matrix": [5, 1], "x": 13.9, "y": 0.93}, + {"matrix": [5, 0], "x": 14.9, "y": 1.13}, + + {"matrix": [1, 0], "x": 0.1, "y": 2.13}, + {"matrix": [1, 1], "x": 1.1, "y": 1.93}, + {"matrix": [1, 2], "x": 2.15, "y": 1.31}, + {"matrix": [1, 3], "x": 3.2, "y": 1}, + {"matrix": [1, 4], "x": 4.2, "y": 1.28}, + {"matrix": [1, 5], "x": 5.2, "y": 1.42}, + + {"matrix": [6, 5], "x": 9.7, "y": 1.42}, + {"matrix": [6, 4], "x": 10.7, "y": 1.28}, + {"matrix": [6, 3], "x": 11.7, "y": 1}, + {"matrix": [6, 2], "x": 12.75, "y": 1.31}, + {"matrix": [6, 1], "x": 13.8, "y": 1.93}, + {"matrix": [6, 0], "x": 14.8, "y": 2.13}, + + {"matrix": [2, 0], "x": 0.2, "y": 3.13}, + {"matrix": [2, 1], "x": 1.2, "y": 2.93}, + {"matrix": [2, 2], "x": 2.2, "y": 2.31}, + {"matrix": [2, 3], "x": 3.2, "y": 2}, + {"matrix": [2, 4], "x": 4.2, "y": 2.28}, + {"matrix": [2, 5], "x": 5.2, "y": 2.42}, + {"matrix": [4, 5], "x": 6.2, "y": 2.88}, + + {"matrix": [9, 5], "x": 8.7, "y": 2.88}, + {"matrix": [7, 5], "x": 9.7, "y": 2.42}, + {"matrix": [7, 4], "x": 10.7, "y": 2.28}, + {"matrix": [7, 3], "x": 11.7, "y": 2}, + {"matrix": [7, 2], "x": 12.7, "y": 2.31}, + {"matrix": [7, 1], "x": 13.7, "y": 2.93}, + {"matrix": [7, 0], "x": 14.7, "y": 3.13}, + + {"matrix": [3, 0], "x": 0.3, "y": 4.13}, + {"matrix": [3, 1], "x": 1.3, "y": 3.93}, + {"matrix": [3, 2], "x": 2.3, "y": 3.73}, + {"matrix": [4, 1], "x": 3.7, "y": 3.28}, + {"matrix": [4, 2], "x": 4.7, "y": 3.42}, + {"matrix": [4, 3], "x": 5.7, "y": 3.88}, + {"matrix": [4, 4], "x": 6.7, "y": 4.44}, + + {"matrix": [9, 4], "x": 8.2, "y": 4.44}, + {"matrix": [9, 3], "x": 9.2, "y": 3.88}, + {"matrix": [9, 2], "x": 10.2, "y": 3.42}, + {"matrix": [9, 1], "x": 11.2, "y": 3.28}, + {"matrix": [8, 2], "x": 12.6, "y": 3.73}, + {"matrix": [8, 1], "x": 13.6, "y": 3.93}, + {"matrix": [8, 0], "x": 14.6, "y": 4.13} + ] + } } } -- cgit v1.2.3