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/chromatonemini/chromatonemini.h | 23 -------- keyboards/chromatonemini/info.json | 94 ++++++++++++++++--------------- 2 files changed, 50 insertions(+), 67 deletions(-) (limited to 'keyboards/chromatonemini') diff --git a/keyboards/chromatonemini/chromatonemini.h b/keyboards/chromatonemini/chromatonemini.h index d42ee500ce..50e563e452 100644 --- a/keyboards/chromatonemini/chromatonemini.h +++ b/keyboards/chromatonemini/chromatonemini.h @@ -18,29 +18,6 @@ #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( \ - enc, sustain, \ - up, \ - left, right, k01, k03, k05, k07, k09, k11, k13, k15, k17, k19, k21, k23, k25, k27, k29, k31, k33, k35, k37, \ - down, k02, k04, k06, k08, k10, k12, k14, k16, k18, k20, k22, k24, k26, k28, k30, k32, k34, k36 \ -) { \ - { enc, down, left, right, up, k01, k02, sustain }, \ - { k03, k04, k05, k06, k07, k08, k09, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, KC_NO }, \ - { k17, k18, k19, k20, k21, k22, k23, KC_NO }, \ - { k24, k25, k26, k27, k28, k29, k30, KC_NO }, \ - { k31, k32, k33, k34, k35, k36, k37, KC_NO } \ -} - - #ifdef RGB_MATRIX_ENABLE extern led_config_t g_led_config; extern const uint8_t led_scale_indicator[12][12]; diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json index e81e52e6c0..cb36157afe 100644 --- a/keyboards/chromatonemini/info.json +++ b/keyboards/chromatonemini/info.json @@ -33,52 +33,58 @@ "pid": "0xF4B4", "device_version": "0.0.1" }, - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"enc", "x":0.5, "y":0}, - {"label":"sustain", "x":1.5, "y":0}, - {"label":"up", "x":0.5, "y":1.5}, - {"label":"left", "x":0, "y":2.5}, - {"label":"right", "x":1, "y":2.5}, - {"label":"k01", "x":2.5, "y":2.5}, - {"label":"k03", "x":3.5, "y":2.5}, - {"label":"k05", "x":4.5, "y":2.5}, - {"label":"k07", "x":5.5, "y":2.5}, - {"label":"k09", "x":6.5, "y":2.5}, - {"label":"k11", "x":7.5, "y":2.5}, - {"label":"k13", "x":8.5, "y":2.5}, - {"label":"k15", "x":9.5, "y":2.5}, - {"label":"k17", "x":10.5, "y":2.5}, - {"label":"k19", "x":11.5, "y":2.5}, - {"label":"k21", "x":12.5, "y":2.5}, - {"label":"k23", "x":13.5, "y":2.5}, - {"label":"k25", "x":14.5, "y":2.5}, - {"label":"k27", "x":15.5, "y":2.5}, - {"label":"k29", "x":16.5, "y":2.5}, - {"label":"k31", "x":17.5, "y":2.5}, - {"label":"k33", "x":18.5, "y":2.5}, - {"label":"k35", "x":19.5, "y":2.5}, - {"label":"k37", "x":20.5, "y":2.5}, - {"label":"down", "x":0.5, "y":3.5}, - {"label":"k02", "x":3, "y":3.5}, - {"label":"k04", "x":4, "y":3.5}, - {"label":"k06", "x":5, "y":3.5}, - {"label":"k08", "x":6, "y":3.5}, - {"label":"k10", "x":7, "y":3.5}, - {"label":"k12", "x":8, "y":3.5}, - {"label":"k14", "x":9, "y":3.5}, - {"label":"k16", "x":10, "y":3.5}, - {"label":"k18", "x":11, "y":3.5}, - {"label":"k20", "x":12, "y":3.5}, - {"label":"k22", "x":13, "y":3.5}, - {"label":"k24", "x":14, "y":3.5}, - {"label":"k26", "x":15, "y":3.5}, - {"label":"k28", "x":16, "y":3.5}, - {"label":"k30", "x":17, "y":3.5}, - {"label":"k32", "x":18, "y":3.5}, - {"label":"k34", "x":19, "y":3.5}, - {"label":"k36", "x":20, "y":3.5}] + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 7], "x": 1.5, "y": 0}, + + {"matrix": [0, 4], "x": 0.5, "y": 1.5}, + + {"matrix": [0, 2], "x": 0, "y": 2.5}, + {"matrix": [0, 3], "x": 1, "y": 2.5}, + + {"matrix": [0, 5], "x": 2.5, "y": 2.5}, + {"matrix": [1, 0], "x": 3.5, "y": 2.5}, + {"matrix": [1, 2], "x": 4.5, "y": 2.5}, + {"matrix": [1, 4], "x": 5.5, "y": 2.5}, + {"matrix": [1, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 1], "x": 7.5, "y": 2.5}, + {"matrix": [2, 3], "x": 8.5, "y": 2.5}, + {"matrix": [2, 5], "x": 9.5, "y": 2.5}, + {"matrix": [3, 0], "x": 10.5, "y": 2.5}, + {"matrix": [3, 2], "x": 11.5, "y": 2.5}, + {"matrix": [3, 4], "x": 12.5, "y": 2.5}, + {"matrix": [3, 6], "x": 13.5, "y": 2.5}, + {"matrix": [4, 1], "x": 14.5, "y": 2.5}, + {"matrix": [4, 3], "x": 15.5, "y": 2.5}, + {"matrix": [4, 5], "x": 16.5, "y": 2.5}, + {"matrix": [5, 0], "x": 17.5, "y": 2.5}, + {"matrix": [5, 2], "x": 18.5, "y": 2.5}, + {"matrix": [5, 4], "x": 19.5, "y": 2.5}, + {"matrix": [5, 6], "x": 20.5, "y": 2.5}, + + {"matrix": [0, 1], "x": 0.5, "y": 3.5}, + + {"matrix": [0, 6], "x": 3, "y": 3.5}, + {"matrix": [1, 1], "x": 4, "y": 3.5}, + {"matrix": [1, 3], "x": 5, "y": 3.5}, + {"matrix": [1, 5], "x": 6, "y": 3.5}, + {"matrix": [2, 0], "x": 7, "y": 3.5}, + {"matrix": [2, 2], "x": 8, "y": 3.5}, + {"matrix": [2, 4], "x": 9, "y": 3.5}, + {"matrix": [2, 6], "x": 10, "y": 3.5}, + {"matrix": [3, 1], "x": 11, "y": 3.5}, + {"matrix": [3, 3], "x": 12, "y": 3.5}, + {"matrix": [3, 5], "x": 13, "y": 3.5}, + {"matrix": [4, 0], "x": 14, "y": 3.5}, + {"matrix": [4, 2], "x": 15, "y": 3.5}, + {"matrix": [4, 4], "x": 16, "y": 3.5}, + {"matrix": [4, 6], "x": 17, "y": 3.5}, + {"matrix": [5, 1], "x": 18, "y": 3.5}, + {"matrix": [5, 3], "x": 19, "y": 3.5}, + {"matrix": [5, 5], "x": 20, "y": 3.5} + ] } }, "encoder": { -- cgit v1.2.3