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/nacly/ua62/info.json | 76 ++++++++++++++++++++++++++++++++++++++++-- keyboards/nacly/ua62/ua62.h | 41 ----------------------- 2 files changed, 74 insertions(+), 43 deletions(-) delete mode 100644 keyboards/nacly/ua62/ua62.h (limited to 'keyboards/nacly/ua62') diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index 82e284ebe7..383825414b 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -17,7 +17,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.7}, + + {"matrix": [0, 7], "x": 9, "y": 0.7}, + {"matrix": [0, 8], "x": 10, "y": 0.35}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.35}, + {"matrix": [0, 11], "x": 13, "y": 0.6}, + {"matrix": [0, 12], "x": 14, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.7}, + + {"matrix": [1, 7], "x": 9, "y": 1.7}, + {"matrix": [1, 8], "x": 10, "y": 1.35}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.35}, + {"matrix": [1, 11], "x": 13, "y": 1.6}, + {"matrix": [1, 12], "x": 14, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.7}, + + {"matrix": [2, 7], "x": 9, "y": 2.7}, + {"matrix": [2, 8], "x": 10, "y": 2.35}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.35}, + {"matrix": [2, 11], "x": 13, "y": 2.6}, + {"matrix": [2, 12], "x": 14, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.35}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.7}, + + {"matrix": [3, 7], "x": 9, "y": 3.7}, + {"matrix": [3, 8], "x": 10, "y": 3.35}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.35}, + {"matrix": [3, 11], "x": 13, "y": 3.6}, + {"matrix": [3, 12], "x": 14, "y": 3.6}, + + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.35}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.35}, + {"matrix": [4, 5], "x": 5, "y": 4.7}, + {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5}, + + {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5}, + {"matrix": [4, 7], "x": 9, "y": 4.7}, + {"matrix": [4, 8], "x": 10, "y": 4.35}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4.35}, + {"matrix": [4, 11], "x": 13, "y": 4.6}, + {"matrix": [4, 12], "x": 14, "y": 4.6} + ] } } - } +} diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h deleted file mode 100644 index 4509bbff3d..0000000000 --- a/keyboards/nacly/ua62/ua62.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 NaCly - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k47, k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d }, \ -} -- cgit v1.2.3