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/recompile_keys/mio/info.json | 89 ++++++++++++++++++---------------- keyboards/recompile_keys/mio/mio.h | 44 ----------------- 2 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 keyboards/recompile_keys/mio/mio.h (limited to 'keyboards/recompile_keys/mio') diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index 8843ad5739..450cf1c3b0 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -21,47 +21,54 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Esc", "x": 0, "y": 0 }, - {"label": "F1", "x": 2, "y": 0 }, - {"label": "F2", "x": 3, "y": 0 }, - {"label": "F3", "x": 4, "y": 0 }, - {"label": "F4", "x": 5, "y": 0 }, - {"label": "F5", "x": 6.25, "y": 0 }, - {"label": "F6", "x": 7.25, "y": 0 }, - {"label": "~", "x": 0, "y": 1.25 }, - {"label": "!", "x": 1, "y": 1.25 }, - {"label": "@", "x": 2, "y": 1.25 }, - {"label": "#", "x": 3, "y": 1.25 }, - {"label": "$", "x": 4, "y": 1.25 }, - {"label": "%", "x": 5, "y": 1.25 }, - {"label": "^", "x": 6, "y": 1.25 }, - {"label": "&", "x": 7, "y": 1.25 }, - {"label": "Tab", "x": 0, "y": 2.25, "w": 1.5 }, - {"label": "Q", "x": 1.5, "y": 2.25 }, - {"label": "W", "x": 2.5, "y": 2.25 }, - {"label": "E", "x": 3.5, "y": 2.25 }, - {"label": "R", "x": 4.5, "y": 2.25 }, - {"label": "T", "x": 5.5, "y": 2.25 }, - {"label": "Y", "x": 6.5, "y": 2.25 }, - {"label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 }, - {"label": "A", "x": 1.75, "y": 3.25 }, - {"label": "S", "x": 2.75, "y": 3.25 }, - {"label": "D", "x": 3.75, "y": 3.25 }, - {"label": "F", "x": 4.75, "y": 3.25 }, - {"label": "G", "x": 5.75, "y": 3.25 }, - {"label": "H", "x": 6.75, "y": 3.25 }, - {"label": "Shift", "x": 0, "y": 4.25, "w": 2.25 }, - {"label": "Z", "x": 2.25, "y": 4.25 }, - {"label": "X", "x": 3.25, "y": 4.25 }, - {"label": "C", "x": 4.25, "y": 4.25 }, - {"label": "V", "x": 5.25, "y": 4.25 }, - {"label": "B", "x": 6.25, "y": 4.25 }, - {"label": "N", "x": 7.25, "y": 4.25 }, - {"label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - {"label": "Alt", "x": 2.5, "y": 5.25, "w": 1.5 }, - {"x": 4, "y": 5.25, "w": 1.5 }, - {"x": 5.5, "y": 5.25, "w": 2.75 }, - {"x": 7, "y": 6.5, "w": 1.25 } + {"matrix": [0, 0], "x": 0, "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": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.5}, + {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 2.75}, + {"matrix": [5, 6], "x": 7, "y": 6.5, "w": 1.25} ] } } diff --git a/keyboards/recompile_keys/mio/mio.h b/keyboards/recompile_keys/mio/mio.h deleted file mode 100644 index da6dc3229c..0000000000 --- a/keyboards/recompile_keys/mio/mio.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 recompile keys - * - * 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, K002, K003, K004, K005, K006, K007, \ - K100, K101, K102, K103, K104, K105, K106, K107, \ - K200, K201, K202, K203, K204, K205, K206, \ - K300, K301, K302, K303, K304, K305, K306, \ - K400, K401, K402, K403, K404, K405, K406, \ - K500, K501, K502, K505, K506 \ -) \ -{ \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107 }, \ - { K200, K201, K202, K203, K204, K205, K206, KC_NO }, \ - { K300, K301, K302, K303, K304, K305, K306, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, K506, KC_NO }, \ -} -- cgit v1.2.3