From 172a40686b84af7f887350a20c526855c7f7649c Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:08:15 +1000 Subject: Move single `LAYOUT_all`s to data driven (#20430) --- keyboards/kakunpc/rabbit_capture_plan/info.json | 145 +++++++++++---------- .../rabbit_capture_plan/rabbit_capture_plan.h | 47 ------- 2 files changed, 76 insertions(+), 116 deletions(-) delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h (limited to 'keyboards/kakunpc/rabbit_capture_plan') diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json index 02ac7d54b7..68dfe8edff 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/info.json @@ -24,79 +24,86 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x": 0.41, "y": 0}, - {"x": 1.41, "y": 0}, - {"x": 2.72, "y": 0}, - {"x": 3.72, "y": 0}, - {"x": 4.72, "y": 0}, - {"x": 5.72, "y": 0}, - {"x": 6.72, "y": 0}, - {"x": 9.62, "y": 0}, - {"x": 10.62, "y": 0}, - {"x": 11.62, "y": 0}, - {"x": 12.62, "y": 0}, - {"x": 14.07, "y": 0}, - {"x": 15.07, "y": 0}, - {"x": 16.07, "y": 0}, - {"x": 17.07, "y": 0}, + {"matrix": [0, 0], "x": 0.41, "y": 0}, + {"matrix": [0, 1], "x": 1.41, "y": 0}, + {"matrix": [0, 2], "x": 2.72, "y": 0}, + {"matrix": [0, 3], "x": 3.72, "y": 0}, + {"matrix": [0, 4], "x": 4.72, "y": 0}, + {"matrix": [0, 5], "x": 5.72, "y": 0}, + {"matrix": [0, 6], "x": 6.72, "y": 0}, - {"x": 0.28, "y": 1, "w": 1.5}, - {"x": 1.78, "y": 1}, - {"x": 3.22, "y": 1}, - {"x": 4.22, "y": 1}, - {"x": 5.22, "y": 1}, - {"x": 6.22, "y": 1}, - {"x": 7.22, "y": 1}, - {"x": 9.12, "y": 1}, - {"x": 10.12, "y": 1}, - {"x": 11.12, "y": 1}, - {"x": 12.12, "y": 1}, - {"x": 13.72, "y": 1}, - {"x": 14.72, "y": 1}, - {"x": 15.72, "y": 1}, - {"x": 16.72, "y": 1, "w": 1.5}, + {"matrix": [5, 0], "x": 9.62, "y": 0}, + {"matrix": [5, 1], "x": 10.62, "y": 0}, + {"matrix": [5, 2], "x": 11.62, "y": 0}, + {"matrix": [5, 3], "x": 12.62, "y": 0}, + {"matrix": [5, 4], "x": 14.07, "y": 0}, + {"matrix": [5, 5], "x": 15.07, "y": 0}, + {"matrix": [5, 6], "x": 16.07, "y": 0}, + {"matrix": [5, 7], "x": 17.07, "y": 0}, - {"x": 0.14, "y": 2, "w": 1.75}, - {"x": 1.89, "y": 2}, - {"x": 3.47, "y": 2}, - {"x": 4.47, "y": 2}, - {"x": 5.47, "y": 2}, - {"x": 6.47, "y": 2}, - {"x": 7.47, "y": 2}, - {"x": 9.37, "y": 2}, - {"x": 10.37, "y": 2}, - {"x": 11.37, "y": 2}, - {"x": 12.37, "y": 2}, - {"x": 14.09, "y": 2}, - {"x": 15.09, "y": 2}, - {"x": 16.09, "y": 2, "w": 2.25}, + {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.78, "y": 1}, + {"matrix": [1, 2], "x": 3.22, "y": 1}, + {"matrix": [1, 3], "x": 4.22, "y": 1}, + {"matrix": [1, 4], "x": 5.22, "y": 1}, + {"matrix": [1, 5], "x": 6.22, "y": 1}, + {"matrix": [1, 6], "x": 7.22, "y": 1}, - {"x": 0, "y": 3, "w": 2.25}, - {"x": 2.25, "y": 3}, - {"x": 3.97, "y": 3}, - {"x": 4.97, "y": 3}, - {"x": 5.97, "y": 3}, - {"x": 6.97, "y": 3}, - {"x": 8.87, "y": 3}, - {"x": 9.87, "y": 3}, - {"x": 10.87, "y": 3}, - {"x": 11.87, "y": 3}, - {"x": 13.72, "y": 3}, - {"x": 14.72, "y": 3}, - {"x": 15.72, "y": 3}, - {"x": 16.72, "y": 3}, - {"x": 18, "y": 3.25}, + {"matrix": [6, 0], "x": 9.12, "y": 1}, + {"matrix": [6, 1], "x": 10.12, "y": 1}, + {"matrix": [6, 2], "x": 11.12, "y": 1}, + {"matrix": [6, 3], "x": 12.12, "y": 1}, + {"matrix": [6, 4], "x": 13.72, "y": 1}, + {"matrix": [6, 5], "x": 14.72, "y": 1}, + {"matrix": [6, 6], "x": 15.72, "y": 1}, + {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5}, - {"x": 0.25, "y": 4, "w": 1.25}, - {"x": 1.5, "y": 4, "w": 1.25}, - {"x": 4.47, "y": 4}, - {"x": 5.47, "y": 4, "w": 2}, - {"x": 7.47, "y": 4}, - {"x": 9.35, "y": 4, "w": 2.75}, - {"x": 12.1, "y": 4}, - {"x": 17, "y": 4.25}, - {"x": 18, "y": 4.25}, - {"x": 19, "y": 4.25} + {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.89, "y": 2}, + {"matrix": [2, 2], "x": 3.47, "y": 2}, + {"matrix": [2, 3], "x": 4.47, "y": 2}, + {"matrix": [2, 4], "x": 5.47, "y": 2}, + {"matrix": [2, 5], "x": 6.47, "y": 2}, + {"matrix": [4, 5], "x": 7.47, "y": 2}, + + {"matrix": [7, 0], "x": 9.37, "y": 2}, + {"matrix": [7, 1], "x": 10.37, "y": 2}, + {"matrix": [7, 2], "x": 11.37, "y": 2}, + {"matrix": [7, 3], "x": 12.37, "y": 2}, + {"matrix": [7, 4], "x": 14.09, "y": 2}, + {"matrix": [7, 5], "x": 15.09, "y": 2}, + {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.97, "y": 3}, + {"matrix": [3, 3], "x": 4.97, "y": 3}, + {"matrix": [3, 4], "x": 5.97, "y": 3}, + {"matrix": [3, 5], "x": 6.97, "y": 3}, + + {"matrix": [8, 0], "x": 8.87, "y": 3}, + {"matrix": [8, 1], "x": 9.87, "y": 3}, + {"matrix": [8, 2], "x": 10.87, "y": 3}, + {"matrix": [8, 3], "x": 11.87, "y": 3}, + {"matrix": [8, 4], "x": 13.72, "y": 3}, + {"matrix": [8, 5], "x": 14.72, "y": 3}, + {"matrix": [8, 6], "x": 15.72, "y": 3}, + {"matrix": [8, 7], "x": 16.72, "y": 3}, + + {"matrix": [9, 0], "x": 18, "y": 3.25}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.47, "y": 4}, + {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 7.47, "y": 4}, + + {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75}, + {"matrix": [9, 2], "x": 12.1, "y": 4}, + + {"matrix": [9, 3], "x": 17, "y": 4.25}, + {"matrix": [9, 4], "x": 18, "y": 4.25}, + {"matrix": [9, 5], "x": 19, "y": 4.25} ] } } diff --git a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h deleted file mode 100644 index 8065fdfeb9..0000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 kakunpc - * - * 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 is 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_all( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, R38, \ - L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L26, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R38, R40, R41, R42, R43, R44, KC_NO, KC_NO } \ -} -- cgit v1.2.3