From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/keybage/radpad/info.json | 114 ++++++++++++++++++------------------- keyboards/keybage/radpad/radpad.h | 87 ---------------------------- 2 files changed, 57 insertions(+), 144 deletions(-) delete mode 100644 keyboards/keybage/radpad/radpad.h (limited to 'keyboards/keybage/radpad') diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 7b3d0c9ea4..2d8e566a79 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -30,93 +30,93 @@ "layouts": { "LAYOUT_4x4_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"x":3, "y":0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} ] }, "LAYOUT_4x3_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"x":3, "y":0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} ] }, "LAYOUT_3x4_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"x":2, "y":0}, + {"matrix": [0, 3], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 1], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4} + {"matrix": [4, 1], "x": 0, "y": 4}, + {"matrix": [4, 2], "x": 1, "y": 4}, + {"matrix": [4, 3], "x": 2, "y": 4} ] }, "LAYOUT_3x3_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"x":2, "y":0}, + {"matrix": [0, 3], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 1], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3} ] } } diff --git a/keyboards/keybage/radpad/radpad.h b/keyboards/keybage/radpad/radpad.h deleted file mode 100644 index be6583bb8e..0000000000 --- a/keyboards/keybage/radpad/radpad.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * 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 - -/* 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_4x4_encoders( \ - k00, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - { k00, XXX, XXX, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} - -#define LAYOUT_4x3_encoders( \ - k00, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, XXX, XXX, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { XXX, XXX, XXX, XXX } \ -} - -#define LAYOUT_3x4_encoders( \ - k01, k03, \ - k11, k12, k13, \ - k21, k22, k23, \ - k31, k32, k33, \ - k41, k42, k43 \ -) \ -{ \ - { XXX, k01, XXX, k03 }, \ - { XXX, k11, k12, k13 }, \ - { XXX, k21, k22, k23 }, \ - { XXX, k31, k32, k33 }, \ - { XXX, k41, k42, k43 } \ -} - -#define LAYOUT_3x3_encoders( \ - k01, k03, \ - k11, k12, k13, \ - k21, k22, k23, \ - k31, k32, k33 \ -) \ -{ \ - { XXX, k01, XXX, k03 }, \ - { XXX, k11, k12, k13 }, \ - { XXX, k21, k22, k23 }, \ - { XXX, k31, k32, k33 }, \ - { XXX, XXX, XXX, XXX } \ -} -- cgit v1.2.3