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/blank_tehnologii/manibus/info.json | 126 +++++++++++++-------------- keyboards/blank_tehnologii/manibus/manibus.h | 47 ---------- 2 files changed, 63 insertions(+), 110 deletions(-) delete mode 100644 keyboards/blank_tehnologii/manibus/manibus.h (limited to 'keyboards/blank_tehnologii/manibus') diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json index 938f4d93f8..b74cd00243 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/info.json @@ -27,78 +27,78 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0.75}, - {"label":"1", "x":1, "y":0.5}, - {"label":"2", "x":2, "y":0.25}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0.25}, - {"label":"5", "x":5, "y":0.25}, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"label":"6", "x":9, "y":0.25}, - {"label":"7", "x":10, "y":0.25}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0.25}, - {"label":"0", "x":13, "y":0.5}, - {"label":"-", "x":14, "y":0.75}, + {"matrix": [5, 1], "x": 9, "y": 0.25}, + {"matrix": [5, 2], "x": 10, "y": 0.25}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.25}, + {"matrix": [5, 5], "x": 13, "y": 0.5}, + {"matrix": [5, 6], "x": 14, "y": 0.75}, - {"label":"Tab", "x":0, "y":1.75}, - {"label":"Q", "x":1, "y":1.5}, - {"label":"W", "x":2, "y":1.25}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.25}, - {"label":"T", "x":5, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"label":"Y", "x":9, "y":1.25}, - {"label":"U", "x":10, "y":1.25}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1.25}, - {"label":"P", "x":13, "y":1.5}, - {"label":"=", "x":14, "y":1.75}, + {"matrix": [6, 1], "x": 9, "y": 1.25}, + {"matrix": [6, 2], "x": 10, "y": 1.25}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.25}, + {"matrix": [6, 5], "x": 13, "y": 1.5}, + {"matrix": [6, 6], "x": 14, "y": 1.75}, - {"label":"Caps", "x":0, "y":2.75}, - {"label":"A", "x":1, "y":2.5}, - {"label":"S", "x":2, "y":2.25}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.25}, - {"label":"G", "x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"label":"H", "x":9, "y":2.25}, - {"label":"J", "x":10, "y":2.25}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2.25}, - {"label":";", "x":13, "y":2.5}, - {"label":"'", "x":14, "y":2.75}, + {"matrix": [7, 1], "x": 9, "y": 2.25}, + {"matrix": [7, 2], "x": 10, "y": 2.25}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.25}, + {"matrix": [7, 5], "x": 13, "y": 2.5}, + {"matrix": [7, 6], "x": 14, "y": 2.75}, - {"label":"Shift", "x":0, "y":3.75}, - {"label":"Z", "x":1, "y":3.5}, - {"label":"X", "x":2, "y":3.25}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.25}, - {"label":"B", "x":5, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, - {"label":"N", "x":9, "y":3.25}, - {"label":"M", "x":10, "y":3.25}, - {"label":",", "x":11, "y":3}, - {"label":".", "x":12, "y":3.25}, - {"label":"/", "x":13, "y":3.5}, - {"label":"|", "x":14, "y":3.75}, + {"matrix": [8, 1], "x": 9, "y": 3.25}, + {"matrix": [8, 2], "x": 10, "y": 3.25}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.25}, + {"matrix": [8, 5], "x": 13, "y": 3.5}, + {"matrix": [8, 6], "x": 14, "y": 3.75}, - {"label":"Control", "x":0, "y":4.75}, - {"label":"Home", "x":1, "y":4.5}, - {"label":"Insert", "x":2, "y":4.25}, - {"label":"Delete", "x":3, "y":4}, - {"label":"GUI", "x":4, "y":4.25}, - {"label":"Space", "x":5, "y":4.25, "h":1.5}, - {"label":"Alt", "x":6, "y":4.25, "h":2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.75}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25}, - {"label":"Enter", "x":8, "y":4.25, "h":2.25}, - {"label":"Backspace", "x":9, "y":4.25, "h":1.5}, - {"label":"MOD", "x":10, "y":4.25}, - {"label":"[", "x":11, "y":4}, - {"label":"]", "x":12, "y":4.25}, - {"label":"End", "x":13, "y":4.5}, - {"label":"~", "x":14, "y":4.75} + {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25}, + {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5}, + {"matrix": [9, 2], "x": 10, "y": 4.25}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4.25}, + {"matrix": [9, 5], "x": 13, "y": 4.5}, + {"matrix": [9, 6], "x": 14, "y": 4.75} ] } } diff --git a/keyboards/blank_tehnologii/manibus/manibus.h b/keyboards/blank_tehnologii/manibus/manibus.h deleted file mode 100644 index e705d79eed..0000000000 --- a/keyboards/blank_tehnologii/manibus/manibus.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 SamuraiKek - * - * 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 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, LT1, RT1, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, LT1 }, \ - { KC_NO, R00, R01, R02, R03, R04, R05 }, \ - { KC_NO, R10, R11, R12, R13, R14, R15 }, \ - { KC_NO, R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, R30, R31, R32, R33, R34, R35 }, \ - { RT1, R40, R41, R42, R43, R44, R45 }, \ - } -- cgit v1.2.3