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/40percentclub/half_n_half/half_n_half.h | 26 ------- keyboards/40percentclub/half_n_half/info.json | 94 ++++++++++++----------- 2 files changed, 49 insertions(+), 71 deletions(-) (limited to 'keyboards/40percentclub') diff --git a/keyboards/40percentclub/half_n_half/half_n_half.h b/keyboards/40percentclub/half_n_half/half_n_half.h index bc330c9cb7..c9b4e6e739 100644 --- a/keyboards/40percentclub/half_n_half/half_n_half.h +++ b/keyboards/40percentclub/half_n_half/half_n_half.h @@ -16,32 +16,6 @@ #pragma once #include "quantum.h" -#define ___ KC_NO - -/* This 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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L34, R32 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { ___, ___, ___, ___, L34, ___, ___ }, \ -\ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, ___, R32, ___, ___ } \ -} #ifdef USE_I2C #error "I2C not Supported" diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json index 0bec859a5a..8174e639c2 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/info.json @@ -21,53 +21,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":7, "y":0}, - {"label":"R01", "x":8, "y":0}, - {"label":"R02", "x":9, "y":0}, - {"label":"R03", "x":10, "y":0}, - {"label":"R04", "x":11, "y":0}, - {"label":"R05", "x":12, "y":0}, - {"label":"R06", "x":13, "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}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":7, "y":1}, - {"label":"R11", "x":8, "y":1}, - {"label":"R12", "x":9, "y":1}, - {"label":"R13", "x":10, "y":1}, - {"label":"R14", "x":11, "y":1}, - {"label":"R15", "x":12, "y":1}, - {"label":"R16", "x":13, "y":1}, + {"matrix": [4, 6], "x": 7, "y": 0}, + {"matrix": [4, 5], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [4, 0], "x": 13, "y": 0}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":7, "y":2}, - {"label":"R21", "x":8, "y":2}, - {"label":"R22", "x":9, "y":2}, - {"label":"R23", "x":10, "y":2}, - {"label":"R24", "x":11, "y":2}, - {"label":"R25", "x":12, "y":2}, - {"label":"R26", "x":13, "y":2}, - - {"label":"L34", "x":4, "y":3, "w":2}, - {"label":"R32", "x":8, "y":3, "w":2} + {"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}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [5, 6], "x": 7, "y": 1}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1}, + {"matrix": [5, 0], "x": 13, "y": 1}, + + {"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}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [6, 6], "x": 7, "y": 2}, + {"matrix": [6, 5], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2}, + {"matrix": [6, 0], "x": 13, "y": 2}, + + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + + {"matrix": [7, 4], "x": 8, "y": 3, "w": 2} ] } } -- cgit v1.2.3