From 4d8dd55bf9b36f5d60afbf01fe192f9a1a7627f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:49:03 +1000 Subject: Move 60% layouts to data driven (#20477) --- keyboards/input_club/infinity60/infinity60.h | 36 -------- keyboards/input_club/infinity60/info.json | 126 +++++++++++++-------------- 2 files changed, 63 insertions(+), 99 deletions(-) delete mode 100644 keyboards/input_club/infinity60/infinity60.h (limited to 'keyboards/input_club') diff --git a/keyboards/input_club/infinity60/infinity60.h b/keyboards/input_club/infinity60/infinity60.h deleted file mode 100644 index ac1470d5f6..0000000000 --- a/keyboards/input_club/infinity60/infinity60.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2014 Jun Wako - -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 LAYOUT_60_ansi_split_bs_rshift( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k10, k11, k12, k13, k14, k15, \ - k16, k17, k18, k20, k21, k22, k23, k24, k25, k26, k27, k28, k30, k31, \ - k32, k33, k34, k35, k36, k37, k38, k40, k41, k42, k43, k44, k45, \ - k46, k47, k48, k50, k51, k52, k53, k54, k55, k56, k57, k58, k60, \ - k61, k62, k63, k64, k65, k66, k67, k68 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 } \ -} diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json index a1ee490098..423ac2a937 100644 --- a/keyboards/input_club/infinity60/info.json +++ b/keyboards/input_club/infinity60/info.json @@ -15,73 +15,73 @@ "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { "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}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, - {"x": 0, "y": 1, "w": 1.5}, - {"x": 1.5, "y": 1}, - {"x": 2.5, "y": 1}, - {"x": 3.5, "y": 1}, - {"x": 4.5, "y": 1}, - {"x": 5.5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 7], "x": 1.5, "y": 1}, + {"matrix": [1, 8], "x": 2.5, "y": 1}, + {"matrix": [2, 0], "x": 3.5, "y": 1}, + {"matrix": [2, 1], "x": 4.5, "y": 1}, + {"matrix": [2, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [2, 4], "x": 7.5, "y": 1}, + {"matrix": [2, 5], "x": 8.5, "y": 1}, + {"matrix": [2, 6], "x": 9.5, "y": 1}, + {"matrix": [2, 7], "x": 10.5, "y": 1}, + {"matrix": [2, 8], "x": 11.5, "y": 1}, + {"matrix": [3, 0], "x": 12.5, "y": 1}, + {"matrix": [3, 1], "x": 13.5, "y": 1, "w": 1.5}, - {"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}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [3, 4], "x": 2.75, "y": 2}, + {"matrix": [3, 5], "x": 3.75, "y": 2}, + {"matrix": [3, 6], "x": 4.75, "y": 2}, + {"matrix": [3, 7], "x": 5.75, "y": 2}, + {"matrix": [3, 8], "x": 6.75, "y": 2}, + {"matrix": [4, 0], "x": 7.75, "y": 2}, + {"matrix": [4, 1], "x": 8.75, "y": 2}, + {"matrix": [4, 2], "x": 9.75, "y": 2}, + {"matrix": [4, 3], "x": 10.75, "y": 2}, + {"matrix": [4, 4], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.25, "y": 3}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3}, - {"x": 6.25, "y": 3}, - {"x": 7.25, "y": 3}, - {"x": 8.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, + {"matrix": [4, 6], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 7], "x": 2.25, "y": 3}, + {"matrix": [4, 8], "x": 3.25, "y": 3}, + {"matrix": [5, 0], "x": 4.25, "y": 3}, + {"matrix": [5, 1], "x": 5.25, "y": 3}, + {"matrix": [5, 2], "x": 6.25, "y": 3}, + {"matrix": [5, 3], "x": 7.25, "y": 3}, + {"matrix": [5, 4], "x": 8.25, "y": 3}, + {"matrix": [5, 5], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [5, 8], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [6, 0], "x": 14, "y": 3}, - {"x": 0, "y": 4, "w": 1.5}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4, "w": 1.5}, - {"x": 4, "y": 4, "w": 6}, - {"x": 10, "y": 4, "w": 1.5}, - {"x": 11.5, "y": 4}, - {"x": 12.5, "y": 4}, - {"x": 13.5, "y": 4, "w": 1.5} + {"matrix": [6, 1], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [6, 2], "x": 1.5, "y": 4}, + {"matrix": [6, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 4], "x": 4, "y": 4, "w": 6}, + {"matrix": [6, 5], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [6, 6], "x": 11.5, "y": 4}, + {"matrix": [6, 7], "x": 12.5, "y": 4}, + {"matrix": [6, 8], "x": 13.5, "y": 4, "w": 1.5} ] } } -- cgit v1.2.3