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/rate/pistachio/rev2/info.json | 124 +++++++++++++++++++++++++++++++- keyboards/rate/pistachio/rev2/rev2.h | 58 --------------- 2 files changed, 123 insertions(+), 59 deletions(-) delete mode 100644 keyboards/rate/pistachio/rev2/rev2.h (limited to 'keyboards/rate/pistachio/rev2') diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json index a98938f559..690c179151 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/info.json @@ -6,5 +6,127 @@ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1.5}, + {"matrix": [1, 4], "x": 4.25, "y": 1.5}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 7.25, "y": 1.5}, + + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5}, + {"matrix": [7, 4], "x": 14, "y": 1.5}, + {"matrix": [7, 5], "x": 15, "y": 1.5}, + {"matrix": [7, 6], "x": 16, "y": 1.5}, + {"matrix": [7, 7], "x": 17, "y": 1.5}, + + {"matrix": [7, 8], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + + {"matrix": [8, 0], "x": 9.5, "y": 2.5}, + {"matrix": [8, 1], "x": 10.5, "y": 2.5}, + {"matrix": [8, 2], "x": 11.5, "y": 2.5}, + {"matrix": [8, 3], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5}, + {"matrix": [8, 5], "x": 14.5, "y": 2.5}, + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + + {"matrix": [8, 7], "x": 18.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 3, "y": 3.5}, + {"matrix": [3, 3], "x": 4, "y": 3.5}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.5}, + {"matrix": [9, 1], "x": 10.75, "y": 3.5}, + {"matrix": [9, 2], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5}, + {"matrix": [9, 4], "x": 13.75, "y": 3.5}, + {"matrix": [9, 5], "x": 14.75, "y": 3.5}, + {"matrix": [9, 6], "x": 15.75, "y": 3.5}, + {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [9, 8], "x": 18.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 2], "x": 12.25, "y": 4.5}, + {"matrix": [10, 3], "x": 13.25, "y": 4.5}, + {"matrix": [10, 4], "x": 14.25, "y": 4.5}, + {"matrix": [10, 5], "x": 15.25, "y": 4.5}, + {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75}, + + {"matrix": [10, 7], "x": 18.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5.5}, + {"matrix": [5, 5], "x": 5.75, "y": 5.5}, + {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.75, "y": 5.5}, + {"matrix": [11, 2], "x": 12.75, "y": 5.5}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5}, + {"matrix": [11, 4], "x": 14.75, "y": 5.5}, + {"matrix": [11, 5], "x": 15.75, "y": 5.5}, + {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 5.5} + ] + } + } } diff --git a/keyboards/rate/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h deleted file mode 100644 index 750778a30e..0000000000 --- a/keyboards/rate/pistachio/rev2/rev2.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2020 rate - -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" - -/* - * ,------------------------------------------------- ---------------------------------------------------------. - * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | - * |-------------------------------------- ---------- ---------------------------------------------------------+ - * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | - * |------------------------------------------------- ---------------------------------------------------------+ - * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 | - * |--------------------------------------------- ------------------------------------------- ------+ - * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 | - * |---------------------------------------------- -------------------------------------------------------+ - * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 | - * |----------------------------------------------- -----------------------------------------------------+ - * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 | - * |----------------------------------------------- ---------------------------------------------------- - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \ - L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R28, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36, R27, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \ - } -- cgit v1.2.3