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/shapeshifter4060/info.json | 100 +++++++++++++------------- keyboards/shapeshifter4060/shapeshifter4060.h | 34 --------- 2 files changed, 52 insertions(+), 82 deletions(-) delete mode 100644 keyboards/shapeshifter4060/shapeshifter4060.h (limited to 'keyboards/shapeshifter4060') diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json index 13c77a9618..7f815832dd 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/info.json @@ -18,57 +18,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.67}, - {"x":1, "y":0.67}, - {"x":2, "y":0.33}, - {"x":3, "y":0}, - {"x":4, "y":0.33}, - {"x":5, "y":0.33}, - {"x":8, "y":0.33}, - {"x":9, "y":0.33}, - {"x":10, "y":0}, - {"x":11, "y":0.33}, - {"x":12, "y":0.67}, - {"x":13, "y":0.67}, + {"matrix": [0, 0], "x": 0, "y": 0.67}, + {"matrix": [0, 1], "x": 1, "y": 0.67}, + {"matrix": [0, 2], "x": 2, "y": 0.33}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.33}, + {"matrix": [0, 5], "x": 5, "y": 0.33}, - {"x":0, "y":1.67}, - {"x":1, "y":1.67}, - {"x":2, "y":1.33}, - {"x":3, "y":1}, - {"x":4, "y":1.33}, - {"x":5, "y":1.33}, - {"x":8, "y":1.33}, - {"x":9, "y":1.33}, - {"x":10, "y":1}, - {"x":11, "y":1.33}, - {"x":12, "y":1.67}, - {"x":13, "y":1.67}, + {"matrix": [0, 6], "x": 8, "y": 0.33}, + {"matrix": [0, 7], "x": 9, "y": 0.33}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.33}, + {"matrix": [0, 10], "x": 12, "y": 0.67}, + {"matrix": [0, 11], "x": 13, "y": 0.67}, - {"x":0, "y":2.67}, - {"x":1, "y":2.67}, - {"x":2, "y":2.33}, - {"x":3, "y":2}, - {"x":4, "y":2.33}, - {"x":5, "y":2.33}, - {"x":8, "y":2.33}, - {"x":9, "y":2.33}, - {"x":10, "y":2}, - {"x":11, "y":2.33}, - {"x":12, "y":2.67}, - {"x":13, "y":2.67}, + {"matrix": [1, 0], "x": 0, "y": 1.67}, + {"matrix": [1, 1], "x": 1, "y": 1.67}, + {"matrix": [1, 2], "x": 2, "y": 1.33}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.33}, + {"matrix": [1, 5], "x": 5, "y": 1.33}, - {"x":0, "y":3.67}, - {"x":1, "y":3.67}, - {"x":2, "y":3.67}, - {"x":3, "y":3.67}, - {"x":4.5, "y":3.42}, - {"x":5.5, "y":3.67}, - {"x":7.5, "y":3.67}, - {"x":8.5, "y":3.42}, - {"x":10, "y":3.67}, - {"x":11, "y":3.67}, - {"x":12, "y":3.67}, - {"x":13, "y":3.67} + {"matrix": [1, 6], "x": 8, "y": 1.33}, + {"matrix": [1, 7], "x": 9, "y": 1.33}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.33}, + {"matrix": [1, 10], "x": 12, "y": 1.67}, + {"matrix": [1, 11], "x": 13, "y": 1.67}, + + {"matrix": [2, 0], "x": 0, "y": 2.67}, + {"matrix": [2, 1], "x": 1, "y": 2.67}, + {"matrix": [2, 2], "x": 2, "y": 2.33}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.33}, + {"matrix": [2, 5], "x": 5, "y": 2.33}, + + {"matrix": [2, 6], "x": 8, "y": 2.33}, + {"matrix": [2, 7], "x": 9, "y": 2.33}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.33}, + {"matrix": [2, 10], "x": 12, "y": 2.67}, + {"matrix": [2, 11], "x": 13, "y": 2.67}, + + {"matrix": [3, 0], "x": 0, "y": 3.67}, + {"matrix": [3, 1], "x": 1, "y": 3.67}, + {"matrix": [3, 2], "x": 2, "y": 3.67}, + {"matrix": [3, 3], "x": 3, "y": 3.67}, + {"matrix": [3, 4], "x": 4.5, "y": 3.42}, + {"matrix": [3, 5], "x": 5.5, "y": 3.67}, + + {"matrix": [3, 6], "x": 7.5, "y": 3.67}, + {"matrix": [3, 7], "x": 8.5, "y": 3.42}, + {"matrix": [3, 8], "x": 10, "y": 3.67}, + {"matrix": [3, 9], "x": 11, "y": 3.67}, + {"matrix": [3, 10], "x": 12, "y": 3.67}, + {"matrix": [3, 11], "x": 13, "y": 3.67} ] } } diff --git a/keyboards/shapeshifter4060/shapeshifter4060.h b/keyboards/shapeshifter4060/shapeshifter4060.h deleted file mode 100644 index 0c5bd7e089..0000000000 --- a/keyboards/shapeshifter4060/shapeshifter4060.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2021 Chuck "@vosechu" Lauer Vose - -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 XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11 }, \ - { k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 }, \ - { k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35 }, \ - { k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 }, \ -} -- cgit v1.2.3