From a84528f85392ccab60fd7130fecb83972539367f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:07:32 +1000 Subject: Move remaining `LAYOUT`s to data driven (#20422) --- keyboards/mechkeys/mechmini/v1/info.json | 164 +++++++++++++++---------------- keyboards/mechkeys/mechmini/v1/v1.h | 48 --------- 2 files changed, 82 insertions(+), 130 deletions(-) delete mode 100644 keyboards/mechkeys/mechmini/v1/v1.h (limited to 'keyboards/mechkeys/mechmini') diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json index 5932ce53d0..eea1d15feb 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/info.json @@ -24,98 +24,98 @@ "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":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, + {"matrix": [3, 0], "x": 0, "y": 0}, + {"matrix": [3, 1], "x": 1, "y": 0}, + {"matrix": [3, 2], "x": 2, "y": 0}, + {"matrix": [3, 3], "x": 3, "y": 0}, + {"matrix": [3, 4], "x": 4, "y": 0}, + {"matrix": [3, 5], "x": 5, "y": 0}, + {"matrix": [3, 6], "x": 6, "y": 0}, + {"matrix": [3, 7], "x": 7, "y": 0}, + {"matrix": [3, 8], "x": 8, "y": 0}, + {"matrix": [3, 9], "x": 9, "y": 0}, + {"matrix": [3, 10], "x": 10, "y": 0}, + {"matrix": [3, 11], "x": 11, "y": 0}, - {"x":0, "y":1, "w":1.25}, - {"x":1.25, "y":1}, - {"x":2.25, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":8.25, "y":1}, - {"x":9.25, "y":1}, - {"x":10.25, "y":1, "w":1.75}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 1}, + {"matrix": [2, 2], "x": 2.25, "y": 1}, + {"matrix": [2, 3], "x": 3.25, "y": 1}, + {"matrix": [2, 4], "x": 4.25, "y": 1}, + {"matrix": [2, 5], "x": 5.25, "y": 1}, + {"matrix": [2, 6], "x": 6.25, "y": 1}, + {"matrix": [2, 7], "x": 7.25, "y": 1}, + {"matrix": [2, 8], "x": 8.25, "y": 1}, + {"matrix": [2, 9], "x": 9.25, "y": 1}, + {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2, "w":1.25}, - {"x":11, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 2}, + {"matrix": [1, 2], "x": 2.75, "y": 2}, + {"matrix": [1, 3], "x": 3.75, "y": 2}, + {"matrix": [1, 4], "x": 4.75, "y": 2}, + {"matrix": [1, 5], "x": 5.75, "y": 2}, + {"matrix": [1, 6], "x": 6.75, "y": 2}, + {"matrix": [1, 7], "x": 7.75, "y": 2}, + {"matrix": [1, 8], "x": 8.75, "y": 2}, + {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 2}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3, "w":6.25}, - {"x":9.5, "y":3, "w":1.25}, - {"x":10.75, "y":3, "w":1.25} + {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 3}, + {"matrix": [0, 2], "x": 2.25, "y": 3}, + {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25}, + {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25} ] }, "LAYOUT_split_space": { "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":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, + {"matrix": [3, 0], "x": 0, "y": 0}, + {"matrix": [3, 1], "x": 1, "y": 0}, + {"matrix": [3, 2], "x": 2, "y": 0}, + {"matrix": [3, 3], "x": 3, "y": 0}, + {"matrix": [3, 4], "x": 4, "y": 0}, + {"matrix": [3, 5], "x": 5, "y": 0}, + {"matrix": [3, 6], "x": 6, "y": 0}, + {"matrix": [3, 7], "x": 7, "y": 0}, + {"matrix": [3, 8], "x": 8, "y": 0}, + {"matrix": [3, 9], "x": 9, "y": 0}, + {"matrix": [3, 10], "x": 10, "y": 0}, + {"matrix": [3, 11], "x": 11, "y": 0}, - {"x":0, "y":1, "w":1.25}, - {"x":1.25, "y":1}, - {"x":2.25, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":8.25, "y":1}, - {"x":9.25, "y":1}, - {"x":10.25, "y":1, "w":1.75}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 1}, + {"matrix": [2, 2], "x": 2.25, "y": 1}, + {"matrix": [2, 3], "x": 3.25, "y": 1}, + {"matrix": [2, 4], "x": 4.25, "y": 1}, + {"matrix": [2, 5], "x": 5.25, "y": 1}, + {"matrix": [2, 6], "x": 6.25, "y": 1}, + {"matrix": [2, 7], "x": 7.25, "y": 1}, + {"matrix": [2, 8], "x": 8.25, "y": 1}, + {"matrix": [2, 9], "x": 9.25, "y": 1}, + {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2, "w":1.25}, - {"x":11, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 2}, + {"matrix": [1, 2], "x": 2.75, "y": 2}, + {"matrix": [1, 3], "x": 3.75, "y": 2}, + {"matrix": [1, 4], "x": 4.75, "y": 2}, + {"matrix": [1, 5], "x": 5.75, "y": 2}, + {"matrix": [1, 6], "x": 6.75, "y": 2}, + {"matrix": [1, 7], "x": 7.75, "y": 2}, + {"matrix": [1, 8], "x": 8.75, "y": 2}, + {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 2}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3, "w":1.25}, - {"x":3.5, "y":3, "w":2.75}, - {"x":6.25, "y":3, "w":2.25}, - {"x":8.5, "y":3, "w":1.25}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3, "w":1.25} + {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 3}, + {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75}, + {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [0, 9], "x": 9.75, "y": 3}, + {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h deleted file mode 100644 index 6991930d6f..0000000000 --- a/keyboards/mechkeys/mechmini/v1/v1.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro - -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 ___ KC_NO - -#define LAYOUT( \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ - K00, K01, K02, K05, K09, K0A \ -) \ -{ \ - { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \ -} - -#define LAYOUT_split_space( \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ - K00, K01, K02, K03, K06, K08, K09, K0A \ -) \ -{ \ - { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \ -} -- cgit v1.2.3