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/kprepublic/bm43hsrgb/bm43hsrgb.h | 30 ---------- keyboards/kprepublic/bm43hsrgb/info.json | 89 +++++++++++++++--------------- 2 files changed, 46 insertions(+), 73 deletions(-) delete mode 100755 keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h (limited to 'keyboards/kprepublic/bm43hsrgb') diff --git a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h b/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h deleted file mode 100755 index 09d99b02d5..0000000000 --- a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 bitstarr - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, \ - K30, K31, K32, K33, K35, K37, K38, K39, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B }, \ - { K30, K31, K32, K33, KC_NO, K35, KC_NO, K37, K38, K39, KC_NO, K3B }, \ -} diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json index 5e2fb50983..70e418e894 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/info.json @@ -21,49 +21,52 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,C6)", "x":0, "y":0}, - {"label":"K01 (E6,D2)", "x":1, "y":0}, - {"label":"K02 (E6,D1)", "x":2, "y":0}, - {"label":"K03 (E6,D0)", "x":3, "y":0}, - {"label":"K04 (E6,D7)", "x":4, "y":0}, - {"label":"K05 (E6,D6)", "x":5, "y":0}, - {"label":"K06 (E6,D4)", "x":6, "y":0}, - {"label":"K07 (E6,D5)", "x":7, "y":0}, - {"label":"K08 (E6,D3)", "x":8, "y":0}, - {"label":"K09 (E6,B7)", "x":9, "y":0}, - {"label":"K0A (E6,B3)", "x":10, "y":0}, - {"label":"K0B (E6,B2)", "x":11, "y":0}, - {"label":"K10 (B6,C6)", "x":0, "y":1, "w":1.25}, - {"label":"K11 (B6,D2)", "x":1.25, "y":1}, - {"label":"K12 (B6,D1)", "x":2.25, "y":1}, - {"label":"K13 (B6,D0)", "x":3.25, "y":1}, - {"label":"K14 (B6,D7)", "x":4.25, "y":1}, - {"label":"K15 (B6,D6)", "x":5.25, "y":1}, - {"label":"K16 (B6,D4)", "x":6.25, "y":1}, - {"label":"K17 (B6,D5)", "x":7.25, "y":1}, - {"label":"K18 (B6,D3)", "x":8.25, "y":1}, - {"label":"K19 (B6,B7)", "x":9.25, "y":1}, - {"label":"K1B (B6,B2)", "x":10.25, "y":1, "w":1.75}, - {"label":"K20 (B4,C6)", "x":0, "y":2, "w":2}, - {"label":"K21 (B4,D2)", "x":2, "y":2}, - {"label":"K22 (B4,D1)", "x":3, "y":2}, - {"label":"K23 (B4,D0)", "x":4, "y":2}, - {"label":"K24 (B4,D7)", "x":5, "y":2}, - {"label":"K25 (B4,D6)", "x":6, "y":2}, - {"label":"K26 (B4,D4)", "x":7, "y":2}, - {"label":"K27 (B4,D5)", "x":8, "y":2}, - {"label":"K28 (B4,D3)", "x":9, "y":2}, - {"label":"K29 (B4,B7)", "x":10, "y":2}, - {"label":"K2B (B4,B2)", "x":11, "y":2}, - {"label":"K30 (B5,C6)", "x":0, "y":3}, - {"label":"K31 (B5,D2)", "x":1, "y":3}, - {"label":"K32 (B5,D1)", "x":2, "y":3}, - {"label":"K33 (B5,D0)", "x":3, "y":3, "w":2.75}, - {"label":"K35 (B5,D6)", "x":5.75, "y":3, "w":2.25}, - {"label":"K37 (B5,D5)", "x":8, "y":3}, - {"label":"K38 (B5,D3)", "x":9, "y":3}, - {"label":"K39 (B5,B7)", "x":10, "y":3}, - {"label":"K3B (B5,B2)", "x":11, "y":3} + {"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": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"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, "w": 2.75}, + {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } -- cgit v1.2.3