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/cool836a/cool836a.h | 42 -------------------------------------- keyboards/cool836a/info.json | 47 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 48 deletions(-) delete mode 100644 keyboards/cool836a/cool836a.h (limited to 'keyboards/cool836a') diff --git a/keyboards/cool836a/cool836a.h b/keyboards/cool836a/cool836a.h deleted file mode 100644 index 08a036d4c0..0000000000 --- a/keyboards/cool836a/cool836a.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Ohashi - * - * 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( \ - K000, K001, K002, K003, K004, K005, K300, K301, K302, K303, K304, K305, \ - K100, K101, K102, K103, K104, K105, K400, K401, K402, K403, K404, K405, \ - K200, K201, K202, K203, K204, K205, K500, K501, K502, K503, K504, K505 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005 }, \ - { K100, K101, K102, K103, K104, K105 }, \ - { K200, K201, K202, K203, K204, K205 }, \ - { K300, K301, K302, K303, K304, K305 }, \ - { K400, K401, K402, K403, K404, K405 }, \ - { K500, K501, K502, K503, K504, K505 }, \ -} diff --git a/keyboards/cool836a/info.json b/keyboards/cool836a/info.json index bcdbbef97c..8f7f688a6b 100644 --- a/keyboards/cool836a/info.json +++ b/keyboards/cool836a/info.json @@ -18,12 +18,47 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "y": 0},{"x": 4, "y": 0},{"x": 5, "y": 0}, - {"x": 7.5, "y": 0},{"x": 8.5, "y": 0},{"x": 9.5, "y": 0},{"x": 10.5, "y": 0},{"x": 11.5,"y": 0},{"x": 12.5,"y": 0}, - {"x": 0, "y": 1},{"x": 1.5, "y": 1},{"x": 2.5, "y": 1},{"x": 3.5, "y": 1},{"x": 4.5, "y": 1},{"x": 5.5, "y": 1}, - {"x": 8, "y": 1},{"x": 9, "y": 1},{"x": 10, "y": 1},{"x": 11, "y": 1},{"x": 12,"y": 1},{"x": 13,"y": 1}, - {"x": 0, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2}, - {"x": 7.5, "y": 2},{"x": 8.5, "y": 2},{"x": 9.5, "y": 2},{"x": 10.5, "y": 2},{"x": 11.5,"y": 2},{"x": 12.5,"y": 2} + {"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}, + + {"matrix": [3, 0], "x": 7.5, "y": 0}, + {"matrix": [3, 1], "x": 8.5, "y": 0}, + {"matrix": [3, 2], "x": 9.5, "y": 0}, + {"matrix": [3, 3], "x": 10.5, "y": 0}, + {"matrix": [3, 4], "x": 11.5, "y": 0}, + {"matrix": [3, 5], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [4, 0], "x": 8, "y": 1}, + {"matrix": [4, 1], "x": 9, "y": 1}, + {"matrix": [4, 2], "x": 10, "y": 1}, + {"matrix": [4, 3], "x": 11, "y": 1}, + {"matrix": [4, 4], "x": 12, "y": 1}, + {"matrix": [4, 5], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + + {"matrix": [5, 0], "x": 7.5, "y": 2}, + {"matrix": [5, 1], "x": 8.5, "y": 2}, + {"matrix": [5, 2], "x": 9.5, "y": 2}, + {"matrix": [5, 3], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [5, 5], "x": 12.5, "y": 2} ] } } -- cgit v1.2.3