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/evancookaudio/sleepingdinosaur/info.json | 59 +++++++++++----------- .../sleepingdinosaur/sleepingdinosaur.h | 41 --------------- 2 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h (limited to 'keyboards/evancookaudio/sleepingdinosaur') diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json index ddae2a187d..5c98daa8ae 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/info.json @@ -18,39 +18,38 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"5", "x":4, "y":0}, - {"label":"-", "x":5, "y":0}, + {"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}, - {"label":"6", "x":0, "y":1}, - {"label":"7", "x":1, "y":1}, - {"label":"8", "x":2, "y":1}, - {"label":"9", "x":3, "y":1}, - {"label":"0", "x":4, "y":1}, - {"label":"R", "x":5, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"label":"/", "x":0, "y":2}, - {"label":"Q", "x":1, "y":2}, - {"label":"W", "x":2, "y":2}, - {"label":"E", "x":3, "y":2}, - {"label":"U", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"label":"Enter", "x":0, "y":3, "h":2}, - {"label":"A", "x":1, "y":3}, - {"label":"S", "x":2, "y":3}, - {"label":"D", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3, "h":2}, - {"label":"O", "x":5, "y":3}, - - {"label":"Z", "x":1, "y":4}, - {"label":"X", "x":2, "y":4}, - {"label":"C", "x":3, "y":4}, - {"label":"N", "x":5, "y":4} - + {"matrix": [3, 0], "x": 0, "y": 3, "h": 2}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "h": 2}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4} ] } } diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h deleted file mode 100644 index 9672fca289..0000000000 --- a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2022 evan cook - * - * 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" - -/* 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(\ - k00, k01, k02, k03, k04, k05, \ - k06, k07, k08, k09, k10, k11, \ - k12, k13, k14, k15, k16, k17, \ - k18, k19, k20, k21, k22, k23, \ - k24, k25, k26, k27 \ - ) \ - { \ - {k00, k01, k02, k03, k04, k05},\ - {k06, k07, k08, k09, k10, k11},\ - {k12, k13, k14, k15, k16, k17},\ - {k18, k19, k20, k21, k22, k23},\ - {KC_NO, k24, k25, k26, KC_NO, k27},\ - } -- cgit v1.2.3