From 172a40686b84af7f887350a20c526855c7f7649c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:08:15 +1000 Subject: Move single `LAYOUT_all`s to data driven (#20430) --- keyboards/adpenrose/akemipad/akemipad.c | 2 +- keyboards/adpenrose/akemipad/akemipad.h | 31 ------------------ keyboards/adpenrose/akemipad/info.json | 56 ++++++++++++++++++--------------- 3 files changed, 32 insertions(+), 57 deletions(-) delete mode 100644 keyboards/adpenrose/akemipad/akemipad.h (limited to 'keyboards/adpenrose/akemipad') diff --git a/keyboards/adpenrose/akemipad/akemipad.c b/keyboards/adpenrose/akemipad/akemipad.c index 647740927c..993396dca0 100644 --- a/keyboards/adpenrose/akemipad/akemipad.c +++ b/keyboards/adpenrose/akemipad/akemipad.c @@ -1,7 +1,7 @@ // Copyright 2022 Arturo Avila (@ADPenrose) // SPDX-License-Identifier: GPL-2.0-or-later -#include "akemipad.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/adpenrose/akemipad/akemipad.h b/keyboards/adpenrose/akemipad/akemipad.h deleted file mode 100644 index 2e4b13baef..0000000000 --- a/keyboards/adpenrose/akemipad/akemipad.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Arturo Avila (@ADPenrose) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is 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_all( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K54, K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03, KC_NO }, \ - { K10, K11, K12, K13, KC_NO }, \ - { K20, K21, K22, K23, KC_NO }, \ - { K30, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, KC_NO }, \ - { K50, K51, K52, K53, K54 } \ -} diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index 6dc558c78e..95f1c903e5 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -28,31 +28,37 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "Num Lock", "x": 1.25, "y": 1.25 }, - { "label": "/", "x": 2.25, "y": 1.25 }, - { "label": "*", "x": 3.25, "y": 1.25 }, - { "label": "-", "x": 4.25, "y": 1.25 }, - { "label": "7", "x": 1.25, "y": 2.25 }, - { "label": "8", "x": 2.25, "y": 2.25 }, - { "label": "9", "x": 3.25, "y": 2.25 }, - { "x": 4.25, "y": 2.25 }, - { "label": "4", "x": 1.25, "y": 3.25 }, - { "label": "5", "x": 2.25, "y": 3.25 }, - { "label": "6", "x": 3.25, "y": 3.25 }, - { "x": 4.25, "y": 3.25 }, - { "label": "1", "x": 1.25, "y": 4.25 }, - { "label": "2", "x": 2.25, "y": 4.25 }, - { "label": "3", "x": 3.25, "y": 4.25 }, - { "x": 4.25, "y": 4.25 }, - { "label": "Enc", "x": 0, "y": 5.25 }, - { "x": 1.25, "y": 5.25 }, - { "x": 2.25, "y": 5.25 }, - { "label": ".", "x": 3.25, "y": 5.25 }, - { "x": 4.25, "y": 5.25 } + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 1.25}, + {"matrix": [1, 1], "x": 2.25, "y": 1.25}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 1.25, "y": 2.25}, + {"matrix": [2, 1], "x": 2.25, "y": 2.25}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 1.25, "y": 3.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 1.25, "y": 4.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + + {"matrix": [5, 4], "x": 0, "y": 5.25}, + + {"matrix": [5, 0], "x": 1.25, "y": 5.25}, + {"matrix": [5, 1], "x": 2.25, "y": 5.25}, + {"matrix": [5, 2], "x": 3.25, "y": 5.25}, + {"matrix": [5, 3], "x": 4.25, "y": 5.25} ] } } -- cgit v1.2.3