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/handwired/consolekeyboard/18key/18key.h | 26 -------------- .../handwired/consolekeyboard/18key/info.json | 41 ++++++++++++---------- 2 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 keyboards/handwired/consolekeyboard/18key/18key.h (limited to 'keyboards/handwired/consolekeyboard/18key') diff --git a/keyboards/handwired/consolekeyboard/18key/18key.h b/keyboards/handwired/consolekeyboard/18key/18key.h deleted file mode 100644 index 9625d9806c..0000000000 --- a/keyboards/handwired/consolekeyboard/18key/18key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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" - -#define LAYOUT( \ - K000, K001, K002, K004, K005, K006, K008, K009, K010, \ - K100, K101, K102, K104, K105, K106, K108, K109, K110 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index f4b99ed3f7..3a37174f36 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -21,27 +21,30 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K08 (D1,E6)", "x":8, "y":0}, - {"label":"K09 (D1,C4)", "x":9, "y":0}, - {"label":"K0A (D1,C5)", "x":10, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K18 (D0,E6)", "x":8, "y":1}, - {"label":"K19 (D0,C4)", "x":9, "y":1}, - {"label":"K1A (D0,C5)", "x":10, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1} ] } } - } -- cgit v1.2.3