From 7a8265247b75bf389c791738a30a01fe3dba2263 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 1 Mar 2023 02:06:11 +1100 Subject: Remove `"w":1` and `"h":1` from info.json (#19961) --- keyboards/dztech/tofu/ii/v1/info.json | 106 +++++++++++++++---------------- keyboards/dztech/tofu/jr/v1/info.json | 114 +++++++++++++++++----------------- 2 files changed, 110 insertions(+), 110 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index b28edb717a..bce81094c2 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -94,72 +94,72 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "matrix": [0, 12], "w": 1, "x": 12, "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 }, + { "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": [0, 12], "x": 12, "y": 0 }, { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 }, + { "matrix": [0, 14], "x": 15, "y": 0 }, { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 }, + { "matrix": [1, 14], "x": 15, "y": 1 }, { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "matrix": [2, 14], "x": 15, "y": 2 }, { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 }, { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, - { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, - { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 } + { "matrix": [4, 12], "x": 13, "y": 4 }, + { "matrix": [4, 13], "x": 14, "y": 4 }, + { "matrix": [4, 14], "x": 15, "y": 4 } ] } } diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index a786b8689d..338c040255 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -97,74 +97,74 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "matrix": [0, 12], "w": 1, "x": 12, "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 }, + { "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": [0, 12], "x": 12, "y": 0 }, { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 }, + { "matrix": [0, 14], "x": 15, "y": 0 }, { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 }, + { "matrix": [1, 14], "x": 15, "y": 1 }, { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 }, + { "matrix": [2, 14], "x": 15, "y": 2 }, { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "matrix": [3, 1], "x": 2.25, "y": 3 }, + { "matrix": [3, 2], "x": 3.25, "y": 3 }, + { "matrix": [3, 3], "x": 4.25, "y": 3 }, + { "matrix": [3, 4], "x": 5.25, "y": 3 }, + { "matrix": [3, 5], "x": 6.25, "y": 3 }, + { "matrix": [3, 6], "x": 7.25, "y": 3 }, + { "matrix": [3, 7], "x": 8.25, "y": 3 }, + { "matrix": [3, 8], "x": 9.25, "y": 3 }, + { "matrix": [3, 9], "x": 10.25, "y": 3 }, + { "matrix": [3, 10], "x": 11.25, "y": 3 }, { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, - { "matrix": [3, 14], "w": 1, "x": 15, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, + { "matrix": [3, 14], "x": 15, "y": 3 }, { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 }, - { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 }, - { "matrix": [4, 10], "w": 1, "x": 12, "y": 4 }, - { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 }, - { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 }, - { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 } + { "matrix": [4, 8], "x": 10, "y": 4 }, + { "matrix": [4, 9], "x": 11, "y": 4 }, + { "matrix": [4, 10], "x": 12, "y": 4 }, + { "matrix": [4, 12], "x": 13, "y": 4 }, + { "matrix": [4, 13], "x": 14, "y": 4 }, + { "matrix": [4, 14], "x": 15, "y": 4 } ] } } -- cgit v1.2.3 From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/dztech/bocc/config.h | 17 ----------------- keyboards/dztech/bocc/info.json | 5 +++++ keyboards/dztech/duo_s/config.h | 6 ------ keyboards/dztech/duo_s/info.json | 5 +++++ keyboards/dztech/dz60rgb/v1/config.h | 16 ---------------- keyboards/dztech/dz60rgb/v1/info.json | 5 +++++ keyboards/dztech/dz60rgb/v2/config.h | 16 ---------------- keyboards/dztech/dz60rgb/v2/info.json | 5 +++++ keyboards/dztech/dz60rgb/v2_1/config.h | 16 ---------------- keyboards/dztech/dz60rgb/v2_1/info.json | 5 +++++ keyboards/dztech/dz60rgb_ansi/v1/config.h | 16 ---------------- keyboards/dztech/dz60rgb_ansi/v1/info.json | 5 +++++ keyboards/dztech/dz60rgb_ansi/v2/config.h | 16 ---------------- keyboards/dztech/dz60rgb_ansi/v2/info.json | 5 +++++ keyboards/dztech/dz60rgb_ansi/v2_1/config.h | 16 ---------------- keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 5 +++++ keyboards/dztech/dz60rgb_wkl/v1/config.h | 16 ---------------- keyboards/dztech/dz60rgb_wkl/v1/info.json | 5 +++++ keyboards/dztech/dz60rgb_wkl/v2/config.h | 16 ---------------- keyboards/dztech/dz60rgb_wkl/v2/info.json | 5 +++++ keyboards/dztech/dz60rgb_wkl/v2_1/config.h | 16 ---------------- keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 5 +++++ keyboards/dztech/dz64rgb/config.h | 5 ----- keyboards/dztech/dz64rgb/info.json | 5 +++++ keyboards/dztech/dz65rgb/v1/config.h | 16 ---------------- keyboards/dztech/dz65rgb/v1/info.json | 5 +++++ keyboards/dztech/dz65rgb/v2/config.h | 16 ---------------- keyboards/dztech/dz65rgb/v2/info.json | 5 +++++ keyboards/dztech/dz65rgb/v3/config.h | 7 ------- keyboards/dztech/dz65rgb/v3/info.json | 5 +++++ keyboards/dztech/dz96/config.h | 25 ------------------------- keyboards/dztech/dz96/info.json | 5 +++++ keyboards/dztech/endless80/config.h | 4 ---- keyboards/dztech/endless80/info.json | 5 +++++ 34 files changed, 85 insertions(+), 240 deletions(-) delete mode 100644 keyboards/dztech/dz96/config.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index e93336086c..b6b02cd5ec 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F0 } -#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, F1, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 87073419ab..eaed62fef5 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -8,6 +8,11 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B0", "B1", "B2", "B3", "F0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index e74f584c91..419464662b 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A15, B3, B4, B5, B11 } -#define MATRIX_COL_PINS { B12, B13, B14, A8, B9, C13, C14, C15, A1, A2, A3, A4, A5, A6, A7 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B15 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 54672e21ae..36dc05b3c9 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -8,6 +8,11 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], + "rows": ["A15", "B3", "B4", "B5", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "community_layouts": ["65_ansi_blocker"], diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h index dded682184..82d7b6d1e1 100644 --- a/keyboards/dztech/dz60rgb/v1/config.h +++ b/keyboards/dztech/dz60rgb/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json index d693e44ecb..68b332c9cd 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1120", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h index 9cba4b023c..094478f34d 100644 --- a/keyboards/dztech/dz60rgb/v2/config.h +++ b/keyboards/dztech/dz60rgb/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json index ddd9fadd3a..3553fab9b2 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1121", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h index 1f3dc86b62..a753832ed1 100644 --- a/keyboards/dztech/dz60rgb/v2_1/config.h +++ b/keyboards/dztech/dz60rgb/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 88618d3745..89e4532160 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1121", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h index 2f7c1cad19..5405d671a5 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json index 5dcb042f96..377c8cd036 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1220", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h index 5b08f5994c..545aa64eea 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json index 42d21e8931..52070e8996 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1221", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h index 8d4766eb81..09e76f52d5 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended // # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index 4bdb295eca..d18a84790d 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1221", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h index 0381423ee7..cfe82a7323 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json index 511a797a5c..278c245871 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1320", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h index e5f3d86e23..38a1aa2c76 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h @@ -1,21 +1,5 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json index 3bd3a96b8e..1265608dbc 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1321", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h index bbc52f701a..5bcfb21cf7 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h @@ -16,22 +16,6 @@ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index 4eb2b1eca0..bd9e24e880 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -3,6 +3,11 @@ "pid": "0x1321", "device_version": "2.1.0" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "debounce": 3 diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h index c212f41c91..43e1b1c609 100644 --- a/keyboards/dztech/dz64rgb/config.h +++ b/keyboards/dztech/dz64rgb/config.h @@ -16,11 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 } -#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 } - -#define DIODE_DIRECTION COL2ROW - #define USB_SUSPEND_WAKEUP_DELAY 5000 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json index efae138c1e..14d9c0122b 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x1013", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], + "rows": ["F5", "F4", "F1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", "layouts": { diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h index 005b8096ea..4a84498975 100644 --- a/keyboards/dztech/dz65rgb/v1/config.h +++ b/keyboards/dztech/dz65rgb/v1/config.h @@ -15,22 +15,6 @@ */ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B1, B10, B11, B14, B12 } -#define MATRIX_COL_PINS { A6, A7, B0, B13, B15, A8, A15, B3, B4, B5, B8, B9, C13, C14, C15 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_FLUSH_LIMIT 26 diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json index 9e88a65fe4..761d31ffb7 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -3,6 +3,11 @@ "pid": "0x1420", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], + "rows": ["B1", "B10", "B11", "B14", "B12"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h index dd993ae7a9..04700c84ed 100644 --- a/keyboards/dztech/dz65rgb/v2/config.h +++ b/keyboards/dztech/dz65rgb/v2/config.h @@ -15,22 +15,6 @@ */ #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_PROCESS_LIMIT 4 # define RGB_MATRIX_LED_FLUSH_LIMIT 26 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json index 502b498e92..332acae14d 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -3,6 +3,11 @@ "pid": "0x1421", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["F0", "F1", "F4", "E6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 3 diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h index 69a6f5c50f..421ae8277c 100755 --- a/keyboards/dztech/dz65rgb/v3/config.h +++ b/keyboards/dztech/dz65rgb/v3/config.h @@ -16,13 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, F1, F4, E6, C6 } -#define MATRIX_COL_PINS { F7, F6, F5, C7, B0, B1, B2, B3, B4, D7, D6, D4, D5, D3, D2} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define USB_SUSPEND_WAKEUP_DELAY 5000 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index 4d46faea48..d40193459d 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -3,6 +3,11 @@ "pid": "0x1424", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["F0", "F1", "F4", "E6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms" } diff --git a/keyboards/dztech/dz96/config.h b/keyboards/dztech/dz96/config.h deleted file mode 100644 index b22fdf5013..0000000000 --- a/keyboards/dztech/dz96/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, E6, F0, D5, D4, D6, C7 } -#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json index 1119a8f2ab..a7229ce131 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/info.json @@ -8,6 +8,11 @@ "pid": "0xDB96", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "F1", "F4", "F5", "F6", "F7", "D7", "B4", "B5", "D0", "D1", "D2", "D3"], + "rows": ["B7", "B3", "E6", "F0", "D5", "D4", "D6", "C7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index c07c913bb9..2200253ff1 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -15,10 +15,6 @@ */ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B5 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 } -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index eb80943837..00ac43a171 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -8,6 +8,11 @@ "pid": "0x1015", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "C6", "C7", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7", "B5"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "E6", "on_state": 0 -- cgit v1.2.3 From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 16 Mar 2023 20:18:33 +1100 Subject: Remove useless "ifdef KEYBOARD_*" (#20078) Co-authored-by: Nick Brassel --- keyboards/dztech/dz65rgb/dz65rgb.c | 17 ----------------- keyboards/dztech/dz65rgb/dz65rgb.h | 28 ---------------------------- 2 files changed, 45 deletions(-) delete mode 100644 keyboards/dztech/dz65rgb/dz65rgb.c delete mode 100644 keyboards/dztech/dz65rgb/dz65rgb.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c deleted file mode 100644 index 8340d8fcee..0000000000 --- a/keyboards/dztech/dz65rgb/dz65rgb.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 . - */ - -#include "dz65rgb.h" diff --git a/keyboards/dztech/dz65rgb/dz65rgb.h b/keyboards/dztech/dz65rgb/dz65rgb.h deleted file mode 100644 index 734a1cff3f..0000000000 --- a/keyboards/dztech/dz65rgb/dz65rgb.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 - -#ifdef KEYBOARD_dztech_dz65rgb_v1 - #include "v1.h" -#endif -#ifdef KEYBOARD_dztech_dz65rgb_v2 - #include "v2.h" -#endif -#ifdef KEYBOARD_dztech_dz65rgb_v3 - #include "v3.h" -#endif -#include "quantum.h" -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/dztech/duo_s/duo_s.c | 16 ---------------- keyboards/dztech/dz96/dz96.c | 17 ----------------- keyboards/dztech/endless80/endless80.c | 16 ---------------- 3 files changed, 49 deletions(-) delete mode 100644 keyboards/dztech/duo_s/duo_s.c delete mode 100644 keyboards/dztech/dz96/dz96.c delete mode 100644 keyboards/dztech/endless80/endless80.c (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/duo_s/duo_s.c b/keyboards/dztech/duo_s/duo_s.c deleted file mode 100644 index ca64b1ff56..0000000000 --- a/keyboards/dztech/duo_s/duo_s.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 . - */ -#include "duo_s.h" diff --git a/keyboards/dztech/dz96/dz96.c b/keyboards/dztech/dz96/dz96.c deleted file mode 100644 index c83c0a2c4d..0000000000 --- a/keyboards/dztech/dz96/dz96.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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 . - */ - -#include "dz96.h" diff --git a/keyboards/dztech/endless80/endless80.c b/keyboards/dztech/endless80/endless80.c deleted file mode 100644 index 27135b54d4..0000000000 --- a/keyboards/dztech/endless80/endless80.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 . - */ -#include "endless80.h" \ No newline at end of file -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/dztech/bocc/config.h | 2 -- keyboards/dztech/duo_s/config.h | 3 +-- keyboards/dztech/endless80/config.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index b6b02cd5ec..53e997559c 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -32,7 +31,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 419464662b..0f6db721ce 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN B15 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,7 +34,7 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_SLEEP -#endif + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index 2200253ff1..eca064ab96 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -16,7 +16,6 @@ #pragma once #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -34,4 +33,3 @@ #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. -#endif -- cgit v1.2.3 From 68efea70b268aceb28c28abb26641fad8d6acefd Mon Sep 17 00:00:00 2001 From: "Johannes H. Jensen" Date: Mon, 3 Apr 2023 05:01:07 +0200 Subject: Add direction to dynamic_macro_record_start_user (#19689) --- keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c index 3870c6aae3..8a7bbd22ec 100644 --- a/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c +++ b/keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c @@ -709,7 +709,7 @@ void leader_end_user(void) { /**************** DYNAMIC MACRO *********************/ -void dynamic_macro_record_start_user(void) { +void dynamic_macro_record_start_user(int8_t direction) { onMac = false; /* reset layer bool as dynamic macro clear the keyboard and reset layers. */ if (!isBlinking && !isRecording) { reset_blink_cycle(); -- cgit v1.2.3 From 1899793f27c9b165b55b28b086bd989f12baf137 Mon Sep 17 00:00:00 2001 From: precondition <57645186+precondition@users.noreply.github.com> Date: Mon, 3 Apr 2023 07:32:47 +0200 Subject: Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps (#20211) --- keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h | 1 - keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h | 1 - keyboards/dztech/dz60rgb/keymaps/xunz/config.h | 1 - keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h | 1 - 4 files changed, 4 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h index a5235259ff..6ad73f6edf 100644 --- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h @@ -20,7 +20,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h index 4ea0d150ea..90627f894f 100644 --- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h @@ -66,7 +66,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h index c302214061..d981df82ed 100644 --- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h +++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h @@ -50,4 +50,3 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h index 93e6990950..bce34bcfbc 100644 --- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h +++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h @@ -60,7 +60,6 @@ #define NO_ACTION_ONESHOT #define QUICK_TAP_TERM 0 -#define IGNORE_MOD_TAP_INTERRUPT // #include "config_led.h" // #include "dz60rgb.h" -- cgit v1.2.3 From 7bfc2a367df91ad6cc701f8490b4b8346a1512b4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 4 Apr 2023 15:20:10 +1000 Subject: Move 65% layouts to data driven (#20308) --- keyboards/dztech/duo_s/duo_s.h | 33 --------------- keyboards/dztech/duo_s/info.json | 74 +++++++++++++++++++++++++++++++- keyboards/dztech/dz65rgb/info.json | 80 +---------------------------------- keyboards/dztech/dz65rgb/v1/info.json | 80 ++++++++++++++++++++++++++++++++++- keyboards/dztech/dz65rgb/v1/v1.c | 2 +- keyboards/dztech/dz65rgb/v1/v1.h | 34 --------------- keyboards/dztech/dz65rgb/v2/info.json | 80 ++++++++++++++++++++++++++++++++++- keyboards/dztech/dz65rgb/v2/v2.c | 2 +- keyboards/dztech/dz65rgb/v2/v2.h | 34 --------------- keyboards/dztech/dz65rgb/v3/info.json | 80 ++++++++++++++++++++++++++++++++++- keyboards/dztech/dz65rgb/v3/v3.c | 2 +- keyboards/dztech/dz65rgb/v3/v3.h | 35 --------------- 12 files changed, 314 insertions(+), 222 deletions(-) delete mode 100644 keyboards/dztech/duo_s/duo_s.h delete mode 100644 keyboards/dztech/dz65rgb/v1/v1.h delete mode 100644 keyboards/dztech/dz65rgb/v2/v2.h delete mode 100755 keyboards/dztech/dz65rgb/v3/v3.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/duo_s/duo_s.h b/keyboards/dztech/duo_s/duo_s.h deleted file mode 100644 index 772a5a25ca..0000000000 --- a/keyboards/dztech/duo_s/duo_s.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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_65_ansi_blocker( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K405, K408, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, K414 } \ -} diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 36dc05b3c9..1ca1a20e22 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -18,7 +18,79 @@ "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + "layout": [ + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/dztech/dz65rgb/info.json b/keyboards/dztech/dz65rgb/info.json index f57c879ed7..d3a127251b 100644 --- a/keyboards/dztech/dz65rgb/info.json +++ b/keyboards/dztech/dz65rgb/info.json @@ -6,83 +6,5 @@ "usb": { "vid": "0x445A" }, - "community_layouts": ["65_ansi"], - "layouts": { - "LAYOUT_65_ansi": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, - {"x":15, "y":0}, - - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - {"x":15, "y":1}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - {"x":15, "y":2}, - - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":15, "y":3}, - - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4} - ] - } - } + "community_layouts": ["65_ansi"] } diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json index 761d31ffb7..72b287c4ef 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -11,5 +11,83 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", - "debounce": 3 + "debounce": 3, + "layouts": { + "LAYOUT_65_ansi": { + "layout": [ + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } } diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c index 0e52a3f911..a3b7bdfb5b 100644 --- a/keyboards/dztech/dz65rgb/v1/v1.c +++ b/keyboards/dztech/dz65rgb/v1/v1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "v1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz65rgb/v1/v1.h b/keyboards/dztech/dz65rgb/v1/v1.h deleted file mode 100644 index 1811cefae6..0000000000 --- a/keyboards/dztech/dz65rgb/v1/v1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 DZTECH - * - * 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 - -#define LAYOUT_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D, K4E } \ -} diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json index 332acae14d..867b22dec8 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -10,5 +10,83 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "debounce": 3 + "debounce": 3, + "layouts": { + "LAYOUT_65_ansi": { + "layout": [ + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } } diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c index 43629e74da..31599ad4b8 100644 --- a/keyboards/dztech/dz65rgb/v2/v2.c +++ b/keyboards/dztech/dz65rgb/v2/v2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "v2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz65rgb/v2/v2.h b/keyboards/dztech/dz65rgb/v2/v2.h deleted file mode 100644 index ead68e8760..0000000000 --- a/keyboards/dztech/dz65rgb/v2/v2.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 DZTECH - * - * 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 - -#define LAYOUT_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D, K4E } \ -} diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index d40193459d..619c94c7a4 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -9,5 +9,83 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "lufa-ms" + "bootloader": "lufa-ms", + "layouts": { + "LAYOUT_65_ansi": { + "layout": [ + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } } diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c index 45cc5cb3bd..ceb5c30f3e 100755 --- a/keyboards/dztech/dz65rgb/v3/v3.c +++ b/keyboards/dztech/dz65rgb/v3/v3.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v3.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/dztech/dz65rgb/v3/v3.h b/keyboards/dztech/dz65rgb/v3/v3.h deleted file mode 100755 index a36069d795..0000000000 --- a/keyboards/dztech/dz65rgb/v3/v3.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 - -#define LAYOUT_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \ - K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E } \ -} -- cgit v1.2.3 From 8bb4cba7b04571d75674f8f3f19462adef015060 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:53:45 +1000 Subject: Move TKL layouts to data driven (#20337) --- keyboards/dztech/endless80/endless80.h | 87 ----- keyboards/dztech/endless80/info.json | 576 +++++++++++++++++---------------- 2 files changed, 300 insertions(+), 363 deletions(-) delete mode 100644 keyboards/dztech/endless80/endless80.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/endless80/endless80.h b/keyboards/dztech/endless80/endless80.h deleted file mode 100644 index 66eab01dd1..0000000000 --- a/keyboards/dztech/endless80/endless80.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 -#define XXX KC_NO -#include "quantum.h" - -/* - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ - * │00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0D │0E │1E │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │2E │3D │3E │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ┌─────┐ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │4C │4D │4E │ │ │ - * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐?? │ ISO Enter - * LShift │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │ │?? │ │ (Solderable PCB only) - * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐ └───┴────┘ - * │40 │ │40 │53 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │ │5C │ - * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ - * │50 │51 │52 │56 │57 │58 │59 │5A │ │5B │5D │5E │ - * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ - * Standard Bottom Row only available on Solderable PCB - * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐ - * │50 │51 │52 │56 │58 │59 │5A │ Tsangan/WKL - * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ - */ - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K3D, K3E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4C, K4D, K4E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K53, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, \ - K50, K51, K52, K56, K57, K58, K59, K5A, K5B, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, K53, XXX, XXX, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E } \ -} - -#define LAYOUT_tkl_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K3D, K3E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4C, K4D, K4E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, \ - K50, K51, K52, K56, K57, K58, K59, K5A, K5B, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E } \ -} - -#define LAYOUT_tkl_ansi_tsangan( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K3D, K3E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4C, K4D, K4E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, \ - K50, K51, K52, K56, K58, K59, K5A, K5B, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, K58, K59, K5A, K5B, K5C, K5D, K5E } \ -} diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index 00ac43a171..090ba39d20 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -23,290 +23,314 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.5, "w":1.25}, - {"x":1.25, "y":4.5}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [1, 14], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [3, 13], "x": 16.25, "y": 1.5}, + {"matrix": [3, 14], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [5, 3], "x": 1.25, "y": 4.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 12], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 13], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} ] }, "LAYOUT_tkl_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [1, 14], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [3, 13], "x": 16.25, "y": 1.5}, + {"matrix": [3, 14], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 12], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 13], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} ] }, "LAYOUT_tkl_ansi_tsangan": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, - {"label":"Win", "x":1.5, "y":5.5}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, - {"x":4, "y":5.5, "w":7}, - {"label":"Alt", "x":11, "y":5.5, "w":1.5}, - {"label":"Menu", "x":12.5, "y":5.5}, - {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + {"matrix": [1, 14], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [3, 13], "x": 16.25, "y": 1.5}, + {"matrix": [3, 14], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 12], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 9], "x": 12.5, "y": 5.5}, + {"matrix": [5, 10], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 13], "x": 16.25, "y": 5.5}, + {"matrix": [5, 14], "x": 17.25, "y": 5.5} ] } } -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/dztech/bocc/config.h | 1 - keyboards/dztech/bocc/info.json | 3 +++ keyboards/dztech/duo_s/config.h | 1 - keyboards/dztech/duo_s/info.json | 3 +++ keyboards/dztech/endless80/config.h | 1 - keyboards/dztech/endless80/info.json | 3 +++ 6 files changed, 9 insertions(+), 3 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/config.h b/keyboards/dztech/bocc/config.h index 53e997559c..ba8626e95c 100644 --- a/keyboards/dztech/bocc/config.h +++ b/keyboards/dztech/bocc/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN E2 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index eaed62fef5..11f157a0a7 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -17,6 +17,9 @@ "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/dztech/duo_s/config.h b/keyboards/dztech/duo_s/config.h index 0f6db721ce..4685510d8b 100644 --- a/keyboards/dztech/duo_s/config.h +++ b/keyboards/dztech/duo_s/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B15 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 1ca1a20e22..9c61c0303a 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -8,6 +8,9 @@ "pid": "0x1012", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B15" + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "A8", "B9", "C13", "C14", "C15", "A1", "A2", "A3", "A4", "A5", "A6", "A7"], "rows": ["A15", "B3", "B4", "B5", "B11"] diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index eca064ab96..eb512c52de 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -15,7 +15,6 @@ */ #pragma once -#define RGB_DI_PIN F7 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index 090ba39d20..df23b681e8 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -17,6 +17,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "F7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"], -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/dztech/dz60rgb/v1/info.json | 3 +++ keyboards/dztech/dz60rgb/v1/rules.mk | 1 - keyboards/dztech/dz60rgb/v2/info.json | 3 +++ keyboards/dztech/dz60rgb/v2/rules.mk | 1 - keyboards/dztech/dz60rgb/v2_1/info.json | 3 +++ keyboards/dztech/dz60rgb/v2_1/rules.mk | 1 - keyboards/dztech/dz60rgb_ansi/v1/info.json | 3 +++ keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 1 - keyboards/dztech/dz60rgb_ansi/v2/info.json | 3 +++ keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 1 - keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 3 +++ keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk | 1 - keyboards/dztech/dz60rgb_wkl/v1/info.json | 3 +++ keyboards/dztech/dz60rgb_wkl/v1/rules.mk | 1 - keyboards/dztech/dz60rgb_wkl/v2/info.json | 3 +++ keyboards/dztech/dz60rgb_wkl/v2/rules.mk | 1 - keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 3 +++ keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk | 1 - keyboards/dztech/dz64rgb/info.json | 3 +++ keyboards/dztech/dz64rgb/rules.mk | 1 - keyboards/dztech/dz65rgb/v1/info.json | 3 +++ keyboards/dztech/dz65rgb/v1/rules.mk | 1 - keyboards/dztech/dz65rgb/v2/info.json | 3 +++ keyboards/dztech/dz65rgb/v2/rules.mk | 1 - keyboards/dztech/dz65rgb/v3/info.json | 3 +++ keyboards/dztech/dz65rgb/v3/rules.mk | 1 - 26 files changed, 39 insertions(+), 13 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json index 68b332c9cd..56a70183f5 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/info.json @@ -3,6 +3,9 @@ "pid": "0x1120", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk index c1fb17d02d..9f3770f0f4 100644 --- a/keyboards/dztech/dz60rgb/v1/rules.mk +++ b/keyboards/dztech/dz60rgb/v1/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json index 3553fab9b2..0b263d8099 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/info.json @@ -3,6 +3,9 @@ "pid": "0x1121", "device_version": "2.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk index c1fb17d02d..9f3770f0f4 100644 --- a/keyboards/dztech/dz60rgb/v2/rules.mk +++ b/keyboards/dztech/dz60rgb/v2/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 89e4532160..796b1bc4a3 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -3,6 +3,9 @@ "pid": "0x1121", "device_version": "2.1.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk index 126a0c0d0b..832eb95f50 100644 --- a/keyboards/dztech/dz60rgb/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk @@ -13,7 +13,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json index 377c8cd036..77a9e801c6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/info.json @@ -3,6 +3,9 @@ "pid": "0x1220", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk index c1fb17d02d..9f3770f0f4 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json index 52070e8996..734d07db31 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/info.json @@ -3,6 +3,9 @@ "pid": "0x1221", "device_version": "2.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk index 5ea934ec9a..17e0aea48d 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index d18a84790d..1d72dc44ee 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -3,6 +3,9 @@ "pid": "0x1221", "device_version": "2.1.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk index 78145d796d..a89963c2d4 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk @@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json index 278c245871..65bb086dc3 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/info.json @@ -3,6 +3,9 @@ "pid": "0x1320", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk index c1fb17d02d..9f3770f0f4 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json index 1265608dbc..b9a2126e3d 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/info.json @@ -3,6 +3,9 @@ "pid": "0x1321", "device_version": "2.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk index c1fb17d02d..9f3770f0f4 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index bd9e24e880..ce830f6b01 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -3,6 +3,9 @@ "pid": "0x1321", "device_version": "2.1.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk index 78145d796d..a89963c2d4 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk @@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json index 14d9c0122b..0b40a23469 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x1013", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"], "rows": ["F5", "F4", "F1", "B3", "B2"] diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk index 04451b76a7..a20c8b449f 100644 --- a/keyboards/dztech/dz64rgb/rules.mk +++ b/keyboards/dztech/dz64rgb/rules.mk @@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 LTO_ENABLE = yes LAYOUT= 64_ansi \ No newline at end of file diff --git a/keyboards/dztech/dz65rgb/v1/info.json b/keyboards/dztech/dz65rgb/v1/info.json index 72b287c4ef..19279921a4 100644 --- a/keyboards/dztech/dz65rgb/v1/info.json +++ b/keyboards/dztech/dz65rgb/v1/info.json @@ -3,6 +3,9 @@ "pid": "0x1420", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/dztech/dz65rgb/v1/rules.mk b/keyboards/dztech/dz65rgb/v1/rules.mk index 7d73c4db84..ea646d3d93 100644 --- a/keyboards/dztech/dz65rgb/v1/rules.mk +++ b/keyboards/dztech/dz65rgb/v1/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/dztech/dz65rgb/v2/info.json b/keyboards/dztech/dz65rgb/v2/info.json index 867b22dec8..b449f4979a 100644 --- a/keyboards/dztech/dz65rgb/v2/info.json +++ b/keyboards/dztech/dz65rgb/v2/info.json @@ -3,6 +3,9 @@ "pid": "0x1421", "device_version": "2.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/dztech/dz65rgb/v2/rules.mk b/keyboards/dztech/dz65rgb/v2/rules.mk index 7d73c4db84..ea646d3d93 100644 --- a/keyboards/dztech/dz65rgb/v2/rules.mk +++ b/keyboards/dztech/dz65rgb/v2/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index 619c94c7a4..e4e4dd6581 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -3,6 +3,9 @@ "pid": "0x1424", "device_version": "3.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk index 67366c7a00..bbe22adb0c 100755 --- a/keyboards/dztech/dz65rgb/v3/rules.mk +++ b/keyboards/dztech/dz65rgb/v3/rules.mk @@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3741 LTO_ENABLE = yes -- cgit v1.2.3 From 441988ef3895171d640e807205e7978ff9755acd Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 20:50:50 +1000 Subject: Move `default` layouts to data driven (#20349) --- keyboards/dztech/dz96/dz96.h | 97 ----- keyboards/dztech/dz96/info.json | 845 ++++++++++++++++++++-------------------- 2 files changed, 421 insertions(+), 521 deletions(-) delete mode 100644 keyboards/dztech/dz96/dz96.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz96/dz96.h b/keyboards/dztech/dz96/dz96.h deleted file mode 100644 index bf84dfc3aa..0000000000 --- a/keyboards/dztech/dz96/dz96.h +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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" - -//Arrow keys and 1.75u right shift -#define LAYOUT_default( \ - K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \ - K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \ - K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \ - K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \ -} - -// Split backspace 1.5u right mods -#define LAYOUT_split_bs_joined_right( \ - K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \ - K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, \ - K40, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \ - K50, K51, K52, K59, K55, K57, K58, K53, K54, K5A, K5B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { K50, K51, K52, K53, K54, K55, KC_NO, K57, K58, K59, K5A, K5B, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \ -} - -// Split numpad (enter, 0), split shifts (right, left), split backspace -// This layout contains every possible keycode placement -#define LAYOUT_split_shift_and_bs( \ - K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \ - K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K70, K71, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K73, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \ - K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B, K5C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C }, \ -} - -// ISO Layout -#define LAYOUT_iso( \ - K00, K01, K02, K03, K04, K60, K61, K62, K63, K05, K06, K07, K08, K72, K09, K0A, K0B, K0C, K7C, \ - K10, K11, K12, K13, K14, K64, K65, K66, K67, K15, K16, K17, K18, K71, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K68, K69, K6A, K6B, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K6C, K75, K76, K77, K35, K36, K37, K73, K38, K39, K3A, K3B, \ - K40, K41, K42, K43, K44, K78, K79, K7A, K7B, K45, K46, K47, K48, K74, K49, K4A, K4B, K4C, \ - K50, K51, K52, K59, K55, K56, K57, K58, K53, K54, K5A, K5B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { KC_NO, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C } \ -} diff --git a/keyboards/dztech/dz96/info.json b/keyboards/dztech/dz96/info.json index a7229ce131..47ceaebcd2 100644 --- a/keyboards/dztech/dz96/info.json +++ b/keyboards/dztech/dz96/info.json @@ -26,449 +26,446 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT_default": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"PRINT SCREEN", "x":13, "y":0}, - {"label":"HOME", "x":14, "y":0}, - {"label":"END", "x":15, "y":0}, - {"label":"PAGE UP", "x":16, "y":0}, - {"label":"PAGE DOWN", "x":17, "y":0}, - {"label":"DELETE", "x":18, "y":0}, + "LAYOUT_default": { + "layout": [ + {"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": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 1], "x": 6, "y": 0}, + {"matrix": [6, 2], "x": 7, "y": 0}, + {"matrix": [6, 3], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + {"matrix": [0, 10], "x": 15, "y": 0}, + {"matrix": [0, 11], "x": 16, "y": 0}, + {"matrix": [0, 12], "x": 17, "y": 0}, + {"matrix": [7, 12], "x": 18, "y": 0}, - {"label":"GRAVE", "x":0, "y":1}, - {"label":"1", "x":1, "y":1}, - {"label":"2", "x":2, "y":1}, - {"label":"3", "x":3, "y":1}, - {"label":"4", "x":4, "y":1}, - {"label":"5", "x":5, "y":1}, - {"label":"6", "x":6, "y":1}, - {"label":"7", "x":7, "y":1}, - {"label":"8", "x":8, "y":1}, - {"label":"9", "x":9, "y":1}, - {"label":"0", "x":10, "y":1}, - {"label":"MINUS", "x":11, "y":1}, - {"label":"EQUAL", "x":12, "y":1}, - {"label":"BACKSPACE", "x":13, "y":1, "w":2}, - {"label":"NUM LOCK", "x":15, "y":1}, - {"label":"KEYPAD /", "x":16, "y":1}, - {"label":"KEYPAD *", "x":17, "y":1}, - {"label":"KEYPAD -", "x":18, "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}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [6, 4], "x": 5, "y": 1}, + {"matrix": [6, 5], "x": 6, "y": 1}, + {"matrix": [6, 6], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [7, 1], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "y": 1}, + {"matrix": [1, 12], "x": 18, "y": 1}, - {"label":"TAB", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"LBRACKET", "x":11.5, "y":2}, - {"label":"RBRACKET", "x":12.5, "y":2}, - {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5}, - {"label":"KEYPAD 7", "x":15, "y":2}, - {"label":"KEYPAD 8", "x":16, "y":2}, - {"label":"KEYPAD 9", "x":17, "y":2}, - {"label":"KEYPAD +", "x":18, "y":2, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [6, 8], "x": 5.5, "y": 2}, + {"matrix": [6, 9], "x": 6.5, "y": 2}, + {"matrix": [6, 10], "x": 7.5, "y": 2}, + {"matrix": [6, 11], "x": 8.5, "y": 2}, + {"matrix": [2, 5], "x": 9.5, "y": 2}, + {"matrix": [2, 6], "x": 10.5, "y": 2}, + {"matrix": [2, 7], "x": 11.5, "y": 2}, + {"matrix": [2, 8], "x": 12.5, "y": 2}, + {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, + {"matrix": [2, 12], "x": 18, "y": 2, "h": 2}, - {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":"SEMICOLON", "x":10.75, "y":3}, - {"label":"QUOTE", "x":11.75, "y":3}, - {"label":"ENTER", "x":12.75, "y":3, "w":2.25}, - {"label":"KEYPAD 4", "x":15, "y":3}, - {"label":"KEYPAD 5", "x":16, "y":3}, - {"label":"KEYPAD 6", "x":17, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [6, 12], "x": 5.75, "y": 3}, + {"matrix": [7, 5], "x": 6.75, "y": 3}, + {"matrix": [7, 6], "x": 7.75, "y": 3}, + {"matrix": [7, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3}, + {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3}, + {"matrix": [3, 10], "x": 16, "y": 3}, + {"matrix": [3, 11], "x": 17, "y": 3}, - {"label":"LSHIFT", "x":0, "y":4, "w":2.25}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"COMMA", "x":9.25, "y":4}, - {"label":"PERIOD", "x":10.25, "y":4}, - {"label":"SLASH", "x":11.25, "y":4}, - {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75}, - {"label":"UP", "x":14, "y":4}, - {"label":"KEYPAD 1", "x":15, "y":4}, - {"label":"KEYPAD 2", "x":16, "y":4}, - {"label":"KEYPAD 3", "x":17, "y":4}, - {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [7, 8], "x": 5.25, "y": 4}, + {"matrix": [7, 9], "x": 6.25, "y": 4}, + {"matrix": [7, 10], "x": 7.25, "y": 4}, + {"matrix": [7, 11], "x": 8.25, "y": 4}, + {"matrix": [4, 5], "x": 9.25, "y": 4}, + {"matrix": [4, 6], "x": 10.25, "y": 4}, + {"matrix": [4, 7], "x": 11.25, "y": 4}, + {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 4], "x": 14, "y": 4}, + {"matrix": [4, 9], "x": 15, "y": 4}, + {"matrix": [4, 10], "x": 16, "y": 4}, + {"matrix": [4, 11], "x": 17, "y": 4}, + {"matrix": [4, 12], "x": 18, "y": 4, "h": 2}, - {"label":"LCTRL", "x":0, "y":5, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":5, "w":1.25}, - {"label":"LALT", "x":2.5, "y":5, "w":1.25}, - {"label":"SPACE", "x":3.75, "y":5, "w":6.25}, - {"label":"RALT", "x":10, "y":5}, - {"label":"RCTRL", "x":11, "y":5}, - {"label":"FN", "x":12, "y":5}, - {"label":"LEFT", "x":13, "y":5}, - {"label":"DOWN", "x":14, "y":5}, - {"label":"RIGHT", "x":15, "y":5}, - {"label":"KEYPAD 0", "x":16, "y":5}, - {"label":"KEYPAD .", "x":17, "y":5} - ] - }, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 5], "x": 10, "y": 5}, + {"matrix": [5, 6], "x": 11, "y": 5}, + {"matrix": [5, 7], "x": 12, "y": 5}, + {"matrix": [5, 8], "x": 13, "y": 5}, + {"matrix": [5, 3], "x": 14, "y": 5}, + {"matrix": [5, 4], "x": 15, "y": 5}, + {"matrix": [5, 10], "x": 16, "y": 5}, + {"matrix": [5, 11], "x": 17, "y": 5} + ] + }, + "LAYOUT_split_bs_joined_right": { + "layout": [ + {"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": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 1], "x": 6, "y": 0}, + {"matrix": [6, 2], "x": 7, "y": 0}, + {"matrix": [6, 3], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + {"matrix": [0, 10], "x": 15, "y": 0}, + {"matrix": [0, 11], "x": 16, "y": 0}, + {"matrix": [0, 12], "x": 17, "y": 0}, + {"matrix": [7, 12], "x": 18, "y": 0}, - "LAYOUT_split_bs_joined_right": { - "layout": [ - {"label": "K00", "x": 0, "y": 0}, - {"label": "K01", "x": 1, "y": 0}, - {"label": "K02", "x": 2, "y": 0}, - {"label": "K03", "x": 3, "y": 0}, - {"label": "K04", "x": 4, "y": 0}, - {"label": "K60", "x": 5, "y": 0}, - {"label": "K61", "x": 6, "y": 0}, - {"label": "K62", "x": 7, "y": 0}, - {"label": "K63", "x": 8, "y": 0}, - {"label": "K05", "x": 9, "y": 0}, - {"label": "K06", "x": 10, "y": 0}, - {"label": "K07", "x": 11, "y": 0}, - {"label": "K08", "x": 12, "y": 0}, - {"label": "K72", "x": 13, "y": 0}, - {"label": "K09", "x": 14, "y": 0}, - {"label": "K0A", "x": 15, "y": 0}, - {"label": "K0B", "x": 16, "y": 0}, - {"label": "K0C", "x": 17, "y": 0}, - {"label": "K7C", "x": 18, "y": 0}, + {"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": [6, 4], "x": 5, "y": 1}, + {"matrix": [6, 5], "x": 6, "y": 1}, + {"matrix": [6, 6], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [7, 0], "x": 13, "y": 1}, + {"matrix": [7, 1], "x": 14, "y": 1}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "y": 1}, + {"matrix": [1, 12], "x": 18, "y": 1}, - {"label": "K10", "x": 0, "y": 1}, - {"label": "K11", "x": 1, "y": 1}, - {"label": "K12", "x": 2, "y": 1}, - {"label": "K13", "x": 3, "y": 1}, - {"label": "K14", "x": 4, "y": 1}, - {"label": "K64", "x": 5, "y": 1}, - {"label": "K65", "x": 6, "y": 1}, - {"label": "K66", "x": 7, "y": 1}, - {"label": "K67", "x": 8, "y": 1}, - {"label": "K15", "x": 9, "y": 1}, - {"label": "K16", "x": 10, "y": 1}, - {"label": "K17", "x": 11, "y": 1}, - {"label": "K18", "x": 12, "y": 1}, - {"label": "K70", "x": 13, "y": 1}, - {"label": "K71", "x": 14, "y": 1}, - {"label": "K19", "x": 15, "y": 1}, - {"label": "K1A", "x": 16, "y": 1}, - {"label": "K1B", "x": 17, "y": 1}, - {"label": "K1C", "x": 18, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [6, 8], "x": 5.5, "y": 2}, + {"matrix": [6, 9], "x": 6.5, "y": 2}, + {"matrix": [6, 10], "x": 7.5, "y": 2}, + {"matrix": [6, 11], "x": 8.5, "y": 2}, + {"matrix": [2, 5], "x": 9.5, "y": 2}, + {"matrix": [2, 6], "x": 10.5, "y": 2}, + {"matrix": [2, 7], "x": 11.5, "y": 2}, + {"matrix": [2, 8], "x": 12.5, "y": 2}, + {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, + {"matrix": [2, 12], "x": 18, "y": 2, "h": 2}, - {"label": "K20", "x": 0, "y": 2, "w": 1.5}, - {"label": "K21", "x": 1.5, "y": 2}, - {"label": "K22", "x": 2.5, "y": 2}, - {"label": "K23", "x": 3.5, "y": 2}, - {"label": "K24", "x": 4.5, "y": 2}, - {"label": "K68", "x": 5.5, "y": 2}, - {"label": "K69", "x": 6.5, "y": 2}, - {"label": "K6A", "x": 7.5, "y": 2}, - {"label": "K6B", "x": 8.5, "y": 2}, - {"label": "K25", "x": 9.5, "y": 2}, - {"label": "K26", "x": 10.5, "y": 2}, - {"label": "K27", "x": 11.5, "y": 2}, - {"label": "K28", "x": 12.5, "y": 2}, - {"label": "K73", "x": 13.5, "y": 2, "w": 1.5}, - {"label": "K29", "x": 15, "y": 2}, - {"label": "K2A", "x": 16, "y": 2}, - {"label": "K2B", "x": 17, "y": 2}, - {"label": "K2C", "x": 18, "y": 2, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [6, 12], "x": 5.75, "y": 3}, + {"matrix": [7, 5], "x": 6.75, "y": 3}, + {"matrix": [7, 6], "x": 7.75, "y": 3}, + {"matrix": [7, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3}, + {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3}, + {"matrix": [3, 10], "x": 16, "y": 3}, + {"matrix": [3, 11], "x": 17, "y": 3}, - {"label": "K30", "x": 0, "y": 3, "w": 1.75}, - {"label": "K31", "x": 1.75, "y": 3}, - {"label": "K32", "x": 2.75, "y": 3}, - {"label": "K33", "x": 3.75, "y": 3}, - {"label": "K34", "x": 4.75, "y": 3}, - {"label": "K6C", "x": 5.75, "y": 3}, - {"label": "K75", "x": 6.75, "y": 3}, - {"label": "K76", "x": 7.75, "y": 3}, - {"label": "K77", "x": 8.75, "y": 3}, - {"label": "K35", "x": 9.75, "y": 3}, - {"label": "K36", "x": 10.75, "y": 3}, - {"label": "K37", "x": 11.75, "y": 3}, - {"label": "K38", "x": 12.75, "y": 3, "w": 2.25}, - {"label": "K39", "x": 15, "y": 3}, - {"label": "K3A", "x": 16, "y": 3}, - {"label": "K3B", "x": 17, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [7, 8], "x": 5.25, "y": 4}, + {"matrix": [7, 9], "x": 6.25, "y": 4}, + {"matrix": [7, 10], "x": 7.25, "y": 4}, + {"matrix": [7, 11], "x": 8.25, "y": 4}, + {"matrix": [4, 5], "x": 9.25, "y": 4}, + {"matrix": [4, 6], "x": 10.25, "y": 4}, + {"matrix": [4, 7], "x": 11.25, "y": 4}, + {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 4], "x": 14, "y": 4}, + {"matrix": [4, 9], "x": 15, "y": 4}, + {"matrix": [4, 10], "x": 16, "y": 4}, + {"matrix": [4, 11], "x": 17, "y": 4}, + {"matrix": [4, 12], "x": 18, "y": 4, "h": 2}, - {"label": "K40", "x": 0, "y": 4, "w": 2.25}, - {"label": "K42", "x": 2.25, "y": 4}, - {"label": "K43", "x": 3.25, "y": 4}, - {"label": "K44", "x": 4.25, "y": 4}, - {"label": "K78", "x": 5.25, "y": 4}, - {"label": "K79", "x": 6.25, "y": 4}, - {"label": "K7A", "x": 7.25, "y": 4}, - {"label": "K7B", "x": 8.25, "y": 4}, - {"label": "K45", "x": 9.25, "y": 4}, - {"label": "K46", "x": 10.25, "y": 4}, - {"label": "K47", "x": 11.25, "y": 4}, - {"label": "K48", "x": 12.25, "y": 4, "w": 1.75}, - {"label": "K74", "x": 14, "y": 4}, - {"label": "K49", "x": 15, "y": 4}, - {"label": "K4A", "x": 16, "y": 4}, - {"label": "K4B", "x": 17, "y": 4}, - {"label": "K4C", "x": 18, "y": 4, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 7], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 8], "x": 13, "y": 5}, + {"matrix": [5, 3], "x": 14, "y": 5}, + {"matrix": [5, 4], "x": 15, "y": 5}, + {"matrix": [5, 10], "x": 16, "y": 5}, + {"matrix": [5, 11], "x": 17, "y": 5} + ] + }, + "LAYOUT_split_shift_and_bs": { + "layout": [ + {"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": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 1], "x": 6, "y": 0}, + {"matrix": [6, 2], "x": 7, "y": 0}, + {"matrix": [6, 3], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + {"matrix": [0, 10], "x": 15, "y": 0}, + {"matrix": [0, 11], "x": 16, "y": 0}, + {"matrix": [0, 12], "x": 17, "y": 0}, + {"matrix": [7, 12], "x": 18, "y": 0}, - {"label": "K50", "x": 0, "y": 5, "w": 1.25}, - {"label": "K51", "x": 1.25, "y": 5, "w": 1.25}, - {"label": "K52", "x": 2.5, "y": 5, "w": 1.25}, - {"label": "K59", "x": 3.75, "y": 5, "w": 6.25}, - {"label": "K55", "x": 10, "y": 5, "w": 1.5}, - {"label": "K57", "x": 11.5, "y": 5, "w": 1.5}, - {"label": "K58", "x": 13, "y": 5}, - {"label": "K53", "x": 14, "y": 5}, - {"label": "K54", "x": 15, "y": 5}, - {"label": "K5A", "x": 16, "y": 5}, - {"label": "K5B", "x": 17, "y": 5} - ] - }, + {"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": [6, 4], "x": 5, "y": 1}, + {"matrix": [6, 5], "x": 6, "y": 1}, + {"matrix": [6, 6], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [7, 0], "x": 13, "y": 1}, + {"matrix": [7, 1], "x": 14, "y": 1}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "y": 1}, + {"matrix": [1, 12], "x": 18, "y": 1}, - "LAYOUT_split_shift_and_bs": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"PRINT SCREEN", "x":13, "y":0}, - {"label":"HOME", "x":14, "y":0}, - {"label":"END", "x":15, "y":0}, - {"label":"PAGE UP", "x":16, "y":0}, - {"label":"PAGE DOWN", "x":17, "y":0}, - {"label":"DELETE", "x":18, "y":0}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [6, 8], "x": 5.5, "y": 2}, + {"matrix": [6, 9], "x": 6.5, "y": 2}, + {"matrix": [6, 10], "x": 7.5, "y": 2}, + {"matrix": [6, 11], "x": 8.5, "y": 2}, + {"matrix": [2, 5], "x": 9.5, "y": 2}, + {"matrix": [2, 6], "x": 10.5, "y": 2}, + {"matrix": [2, 7], "x": 11.5, "y": 2}, + {"matrix": [2, 8], "x": 12.5, "y": 2}, + {"matrix": [7, 3], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, + {"matrix": [2, 12], "x": 18, "y": 2}, - {"label":"GRAVE", "x":0, "y":1}, - {"label":"1", "x":1, "y":1}, - {"label":"2", "x":2, "y":1}, - {"label":"3", "x":3, "y":1}, - {"label":"4", "x":4, "y":1}, - {"label":"5", "x":5, "y":1}, - {"label":"6", "x":6, "y":1}, - {"label":"7", "x":7, "y":1}, - {"label":"8", "x":8, "y":1}, - {"label":"9", "x":9, "y":1}, - {"label":"0", "x":10, "y":1}, - {"label":"MINUS", "x":11, "y":1}, - {"label":"EQUAL", "x":12, "y":1}, - {"label":"BACKSPACE", "x":13, "y":1}, - {"label":"BACKSPACE", "x":14, "y":1}, - {"label":"NUM LOCK", "x":15, "y":1}, - {"label":"KEYPAD /", "x":16, "y":1}, - {"label":"KEYPAD *", "x":17, "y":1}, - {"label":"KEYPAD -", "x":18, "y":1}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [6, 12], "x": 5.75, "y": 3}, + {"matrix": [7, 5], "x": 6.75, "y": 3}, + {"matrix": [7, 6], "x": 7.75, "y": 3}, + {"matrix": [7, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3}, + {"matrix": [3, 8], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 15, "y": 3}, + {"matrix": [3, 10], "x": 16, "y": 3}, + {"matrix": [3, 11], "x": 17, "y": 3}, + {"matrix": [3, 12], "x": 18, "y": 3}, - {"label":"TAB", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"LBRACKET", "x":11.5, "y":2}, - {"label":"RBRACKET", "x":12.5, "y":2}, - {"label":"BACKSLASH", "x":13.5, "y":2, "w":1.5}, - {"label":"KEYPAD 7", "x":15, "y":2}, - {"label":"KEYPAD 8", "x":16, "y":2}, - {"label":"KEYPAD 9", "x":17, "y":2}, - {"label":"KEYPAD +", "x":18, "y":2}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [7, 8], "x": 5.25, "y": 4}, + {"matrix": [7, 9], "x": 6.25, "y": 4}, + {"matrix": [7, 10], "x": 7.25, "y": 4}, + {"matrix": [7, 11], "x": 8.25, "y": 4}, + {"matrix": [4, 5], "x": 9.25, "y": 4}, + {"matrix": [4, 6], "x": 10.25, "y": 4}, + {"matrix": [4, 7], "x": 11.25, "y": 4}, + {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 4], "x": 14, "y": 4}, + {"matrix": [4, 9], "x": 15, "y": 4}, + {"matrix": [4, 10], "x": 16, "y": 4}, + {"matrix": [4, 11], "x": 17, "y": 4}, + {"matrix": [4, 12], "x": 18, "y": 4}, - {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":"SEMICOLON", "x":10.75, "y":3}, - {"label":"QUOTE", "x":11.75, "y":3}, - {"label":"ENTER", "x":12.75, "y":3, "w":2.25}, - {"label":"KEYPAD 4", "x":15, "y":3}, - {"label":"KEYPAD 5", "x":16, "y":3}, - {"label":"KEYPAD 6", "x":17, "y":3}, - {"label":"KEYPAD +", "x":18, "y":3}, + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 5], "x": 10, "y": 5}, + {"matrix": [5, 6], "x": 11, "y": 5}, + {"matrix": [5, 7], "x": 12, "y": 5}, + {"matrix": [5, 8], "x": 13, "y": 5}, + {"matrix": [5, 3], "x": 14, "y": 5}, + {"matrix": [5, 4], "x": 15, "y": 5}, + {"matrix": [5, 10], "x": 16, "y": 5}, + {"matrix": [5, 11], "x": 17, "y": 5}, + {"matrix": [5, 12], "x": 18, "y": 5} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"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": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 1], "x": 6, "y": 0}, + {"matrix": [6, 2], "x": 7, "y": 0}, + {"matrix": [6, 3], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + {"matrix": [0, 10], "x": 15, "y": 0}, + {"matrix": [0, 11], "x": 16, "y": 0}, + {"matrix": [0, 12], "x": 17, "y": 0}, + {"matrix": [7, 12], "x": 18, "y": 0}, - {"label":"LSHIFT", "x":0, "y":4, "w":1.25}, - {"label":"ISO BACKSLASH", "x":1.25, "y":4}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"COMMA", "x":9.25, "y":4}, - {"label":"PERIOD", "x":10.25, "y":4}, - {"label":"SLASH", "x":11.25, "y":4}, - {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75}, - {"label":"UP", "x":14, "y":4}, - {"label":"KEYPAD 1", "x":15, "y":4}, - {"label":"KEYPAD 2", "x":16, "y":4}, - {"label":"KEYPAD 3", "x":17, "y":4}, - {"label":"KEYPAD ENTER", "x":18, "y":4}, + {"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": [6, 4], "x": 5, "y": 1}, + {"matrix": [6, 5], "x": 6, "y": 1}, + {"matrix": [6, 6], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [7, 1], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "y": 1}, + {"matrix": [1, 12], "x": 18, "y": 1}, - {"label":"LCTRL", "x":0, "y":5, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":5, "w":1.25}, - {"label":"LALT", "x":2.5, "y":5, "w":1.25}, - {"label":"SPACE", "x":3.75, "y":5, "w":6.25}, - {"label":"RALT", "x":10, "y":5}, - {"label":"MENU", "x":11, "y":5}, - {"label":"RCTRL", "x":12, "y":5}, - {"label":"LEFT", "x":13, "y":5}, - {"label":"DOWN", "x":14, "y":5}, - {"label":"RIGHT", "x":15, "y":5}, - {"label":"KEYPAD 0", "x":16, "y":5}, - {"label":"KEYPAD .", "x":17, "y":5}, - {"label":"KEYPAD ENTER", "x":18, "y":5} - ] - }, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [6, 8], "x": 5.5, "y": 2}, + {"matrix": [6, 9], "x": 6.5, "y": 2}, + {"matrix": [6, 10], "x": 7.5, "y": 2}, + {"matrix": [6, 11], "x": 8.5, "y": 2}, + {"matrix": [2, 5], "x": 9.5, "y": 2}, + {"matrix": [2, 6], "x": 10.5, "y": 2}, + {"matrix": [2, 7], "x": 11.5, "y": 2}, + {"matrix": [2, 8], "x": 12.5, "y": 2}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, + {"matrix": [2, 12], "x": 18, "y": 2, "h": 2}, - "LAYOUT_iso": { - "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"PRINT SCREEN", "x":13, "y":0}, - {"label":"HOME", "x":14, "y":0}, - {"label":"END", "x":15, "y":0}, - {"label":"PAGE UP", "x":16, "y":0}, - {"label":"PAGE DOWN", "x":17, "y":0}, - {"label":"DELETE", "x":18, "y":0}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [6, 12], "x": 5.75, "y": 3}, + {"matrix": [7, 5], "x": 6.75, "y": 3}, + {"matrix": [7, 6], "x": 7.75, "y": 3}, + {"matrix": [7, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3}, + {"matrix": [7, 3], "x": 12.75, "y": 3}, + {"matrix": [3, 8], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 9], "x": 15, "y": 3}, + {"matrix": [3, 10], "x": 16, "y": 3}, + {"matrix": [3, 11], "x": 17, "y": 3}, - {"label":"GRAVE", "x":0, "y":1}, - {"label":"1", "x":1, "y":1}, - {"label":"2", "x":2, "y":1}, - {"label":"3", "x":3, "y":1}, - {"label":"4", "x":4, "y":1}, - {"label":"5", "x":5, "y":1}, - {"label":"6", "x":6, "y":1}, - {"label":"7", "x":7, "y":1}, - {"label":"8", "x":8, "y":1}, - {"label":"9", "x":9, "y":1}, - {"label":"0", "x":10, "y":1}, - {"label":"MINUS", "x":11, "y":1}, - {"label":"EQUAL", "x":12, "y":1}, - {"label":"BACKSPACE", "x":13, "y":1, "w":2}, - {"label":"NUM LOCK", "x":15, "y":1}, - {"label":"KEYPAD /", "x":16, "y":1}, - {"label":"KEYPAD *", "x":17, "y":1}, - {"label":"KEYPAD -", "x":18, "y":1}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [7, 8], "x": 5.25, "y": 4}, + {"matrix": [7, 9], "x": 6.25, "y": 4}, + {"matrix": [7, 10], "x": 7.25, "y": 4}, + {"matrix": [7, 11], "x": 8.25, "y": 4}, + {"matrix": [4, 5], "x": 9.25, "y": 4}, + {"matrix": [4, 6], "x": 10.25, "y": 4}, + {"matrix": [4, 7], "x": 11.25, "y": 4}, + {"matrix": [4, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 4], "x": 14, "y": 4}, + {"matrix": [4, 9], "x": 15, "y": 4}, + {"matrix": [4, 10], "x": 16, "y": 4}, + {"matrix": [4, 11], "x": 17, "y": 4}, + {"matrix": [4, 12], "x": 18, "y": 4, "h": 2}, - {"label":"TAB", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"LBRACKET", "x":11.5, "y":2}, - {"label":"RBRACKET", "x":12.5, "y":2}, - {"label":"KEYPAD 7", "x":15, "y":2}, - {"label":"KEYPAD 8", "x":16, "y":2}, - {"label":"KEYPAD 9", "x":17, "y":2}, - {"label":"KEYPAD +", "x":18, "y":2, "h":2}, - - {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":"SEMICOLON", "x":10.75, "y":3}, - {"label":"QUOTE", "x":11.75, "y":3}, - {"label":"ISO HASH", "x":12.75, "y":3}, - {"label":"ENTER", "x":13.75, "y":2, "w":1.25, "h":2}, - {"label":"KEYPAD 4", "x":15, "y":3}, - {"label":"KEYPAD 5", "x":16, "y":3}, - {"label":"KEYPAD 6", "x":17, "y":3}, - - {"label":"LSHIFT", "x":0, "y":4, "w":1.25}, - {"label":"ISO BACKSLASH", "x":1.25, "y":4}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"COMMA", "x":9.25, "y":4}, - {"label":"PERIOD", "x":10.25, "y":4}, - {"label":"SLASH", "x":11.25, "y":4}, - {"label":"RSHIFT", "x":12.25, "y":4, "w":1.75}, - {"label":"UP", "x":14, "y":4}, - {"label":"KEYPAD 1", "x":15, "y":4}, - {"label":"KEYPAD 2", "x":16, "y":4}, - {"label":"KEYPAD 3", "x":17, "y":4}, - {"label":"KEYPAD ENTER", "x":18, "y":4, "h":2}, - - {"label":"LCTRL", "x":0, "y":5, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":5, "w":1.25}, - {"label":"LALT", "x":2.5, "y":5, "w":1.25}, - {"label":"SPACE", "x":3.75, "y":5, "w":6.25}, - {"label":"RALT", "x":10, "y":5}, - {"label":"MENU", "x":11, "y":5}, - {"label":"RCTRL", "x":12, "y":5}, - {"label":"LEFT", "x":13, "y":5}, - {"label":"DOWN", "x":14, "y":5}, - {"label":"RIGHT", "x":15, "y":5}, - {"label":"KEYPAD 0", "x":16, "y":5}, - {"label":"KEYPAD .", "x":17, "y":5} - ] - } + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 9], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 5], "x": 10, "y": 5}, + {"matrix": [5, 6], "x": 11, "y": 5}, + {"matrix": [5, 7], "x": 12, "y": 5}, + {"matrix": [5, 8], "x": 13, "y": 5}, + {"matrix": [5, 3], "x": 14, "y": 5}, + {"matrix": [5, 4], "x": 15, "y": 5}, + {"matrix": [5, 10], "x": 16, "y": 5}, + {"matrix": [5, 11], "x": 17, "y": 5} + ] + } } } -- cgit v1.2.3 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/dztech/dz60rgb/dz60rgb.c | 2 +- keyboards/dztech/dz60rgb/dz60rgb.h | 19 ------ keyboards/dztech/dz60rgb/info.json | 126 ++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 83 deletions(-) delete mode 100644 keyboards/dztech/dz60rgb/dz60rgb.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c index cfefd2833d..811dd0cd91 100644 --- a/keyboards/dztech/dz60rgb/dz60rgb.c +++ b/keyboards/dztech/dz60rgb/dz60rgb.c @@ -1,4 +1,4 @@ -#include "dz60rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz60rgb/dz60rgb.h b/keyboards/dztech/dz60rgb/dz60rgb.h deleted file mode 100644 index 872be7e1b3..0000000000 --- a/keyboards/dztech/dz60rgb/dz60rgb.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \ -} diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json index d5179aa09f..17439e3443 100644 --- a/keyboards/dztech/dz60rgb/info.json +++ b/keyboards/dztech/dz60rgb/info.json @@ -9,73 +9,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3, "w":1.75}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 11], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } -- cgit v1.2.3 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/dztech/bocc/bocc.c | 2 +- keyboards/dztech/bocc/bocc.h | 32 -------------- keyboards/dztech/bocc/info.json | 92 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 92 insertions(+), 34 deletions(-) delete mode 100644 keyboards/dztech/bocc/bocc.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/bocc.c b/keyboards/dztech/bocc/bocc.c index 2aada9b5ea..fc2eb8d6eb 100644 --- a/keyboards/dztech/bocc/bocc.c +++ b/keyboards/dztech/bocc/bocc.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "bocc.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(E6); diff --git a/keyboards/dztech/bocc/bocc.h b/keyboards/dztech/bocc/bocc.h deleted file mode 100644 index 271f503879..0000000000 --- a/keyboards/dztech/bocc/bocc.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 dztech - * - * 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_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K414, K015, K016, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, \ - K300, K301, K302, K405, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K316, \ - K400, K401, K402, K403, K404, K407, K411, K412, K413, K415, K416 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, KC_NO, K216 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, K316 }, \ - { K400, K401, K402, K403, K404, K405, KC_NO, K407, KC_NO, KC_NO, KC_NO, K411, K412, K413, K414, K415, K416 } \ -} diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 11f157a0a7..32da10cfae 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -24,7 +24,97 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"label":"~", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"label":"Home", "x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"Page Up", "x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2.25}, {"label":"Page Down", "x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"label":"Shift", "x":3.75, "y":3}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.75}, {"label":"\u2191", "x":16.5, "y":3}, {"label":"End", "x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Win", "x":3.75, "y":4, "w":1.25}, {"label":"Alt", "x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":6.25}, {"label":"Alt", "x":12.5, "y":4, "w":1.25}, {"label":"Fn", "x":13.75, "y":4, "w":1.25}, {"label":"\u2190", "x":15.5, "y":4}, {"label":"\u2193", "x":16.5, "y":4}, {"label":"\u2192", "x":17.5, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 14.5, "y": 0}, + {"matrix": [4, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 3}, + {"matrix": [3, 3], "x": 4.75, "y": 3}, + {"matrix": [3, 4], "x": 5.75, "y": 3}, + {"matrix": [3, 5], "x": 6.75, "y": 3}, + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3}, + {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 15.5, "y": 4}, + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4} + ] } } } -- cgit v1.2.3 From 0ddb7d7863d180c571091dd1fa154abb53de5a04 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:09:08 +1000 Subject: Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (#20438) --- keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c | 2 +- keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h | 19 ---- keyboards/dztech/dz60rgb_ansi/info.json | 122 ++++++++++++------------- keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c | 2 +- keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h | 21 ----- keyboards/dztech/dz60rgb_wkl/info.json | 127 ++++++++++++++------------- 6 files changed, 128 insertions(+), 165 deletions(-) delete mode 100644 keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h delete mode 100644 keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c index 475c9cc4b5..b607a58a4e 100644 --- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c +++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c @@ -1,4 +1,4 @@ -#include "dz60rgb_ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h deleted file mode 100644 index e522c482c2..0000000000 --- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_60_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ - K40, K41, K42, K45, K49, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D } \ -} diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json index e3521ed88b..12fefa5d87 100644 --- a/keyboards/dztech/dz60rgb_ansi/info.json +++ b/keyboards/dztech/dz60rgb_ansi/info.json @@ -10,71 +10,71 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0, "w":2}, + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":2.75}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":12.5, "y":4, "w":1.25}, - {"x":13.75, "y":4, "w":1.25} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c index 5ee8d1b531..5a55bacefc 100644 --- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c +++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c @@ -1,4 +1,4 @@ -#include "dz60rgb_wkl.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h deleted file mode 100644 index 5f47903fc8..0000000000 --- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_60_tsangan_hhkb( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K45, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D } \ -} - -#define LAYOUT_HHKB LAYOUT_60_tsangan_hhkb diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json index 76199d5532..52685db180 100644 --- a/keyboards/dztech/dz60rgb_wkl/info.json +++ b/keyboards/dztech/dz60rgb_wkl/info.json @@ -7,75 +7,78 @@ "vid": "0x445A" }, "community_layouts": ["60_tsangan_hhkb"], + "layout_aliases": { + "LAYOUT_HHKB": "LAYOUT_60_tsangan_hhkb" + }, "layouts": { "LAYOUT_60_tsangan_hhkb": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "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}, + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } -- cgit v1.2.3 From 4d8dd55bf9b36f5d60afbf01fe192f9a1a7627f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 27 Apr 2023 07:49:03 +1000 Subject: Move 60% layouts to data driven (#20477) --- keyboards/dztech/dz64rgb/dz64rgb.c | 2 +- keyboards/dztech/dz64rgb/dz64rgb.h | 35 ---------- keyboards/dztech/dz64rgb/info.json | 128 ++++++++++++++++++------------------- 3 files changed, 65 insertions(+), 100 deletions(-) delete mode 100644 keyboards/dztech/dz64rgb/dz64rgb.h (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c index 4173abf542..5fa08a3ee8 100644 --- a/keyboards/dztech/dz64rgb/dz64rgb.c +++ b/keyboards/dztech/dz64rgb/dz64rgb.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "dz64rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz64rgb/dz64rgb.h b/keyboards/dztech/dz64rgb/dz64rgb.h deleted file mode 100644 index 3d27e2620d..0000000000 --- a/keyboards/dztech/dz64rgb/dz64rgb.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 DZTECH - * - * 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 - -#define LAYOUT_64_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \ -} diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json index 0b40a23469..aa69238191 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/info.json @@ -21,74 +21,74 @@ "layouts": { "LAYOUT_64_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[{", "x":11.5, "y":1}, - {"label":"]}", "x":12.5, "y":1}, - {"label":"\\|", "x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";:", "x":10.75, "y":2}, - {"label":"'\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label":"Shift", "x":0, "y":3, "w":2}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":7, "y":3}, - {"label":"M", "x":8, "y":3}, - {"label":",<", "x":9, "y":3}, - {"label":".>", "x":10, "y":3}, - {"label":"/?", "x":11, "y":3}, - {"label":"Shift", "x":12, "y":3}, - {"label":"\u2191", "x":13, "y":3}, - {"label":"Delete", "x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Ctrl", "x":11, "y":4}, - {"label":"\u2190", "x":12, "y":4}, - {"label":"\u2193", "x":13, "y":4}, - {"label":"\u2192", "x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } -- cgit v1.2.3 From 45a474d07e84a8a078bd9ebf356c45eec8713ebe Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 28 Apr 2023 22:16:34 -0700 Subject: DZTech Bocc Layout Macro Additions (#20611) * add matrix_diagram.md * info.json: apply friendly formatting * refactor keymaps - number layer indices - use four-space indent - grid-align keycodes * add LAYOUT_65_xt_ansi_blocker_split_bs * add LAYOUT_65_xt_ansi_blocker * add LAYOUT_65_xt_ansi_blocker_tsangan_split_bs * add LAYOUT_65_xt_ansi_blocker_tsangan * Apply suggestions from code review --- keyboards/dztech/bocc/info.json | 542 +++++++++++++++++++++---- keyboards/dztech/bocc/keymaps/default/keymap.c | 13 +- keyboards/dztech/bocc/keymaps/via/keymap.c | 52 +-- keyboards/dztech/bocc/matrix_diagram.md | 21 + 4 files changed, 509 insertions(+), 119 deletions(-) create mode 100644 keyboards/dztech/bocc/matrix_diagram.md (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 32da10cfae..5113532c7a 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -25,95 +25,459 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - - {"matrix": [0, 2], "x": 2.5, "y": 0}, - {"matrix": [0, 3], "x": 3.5, "y": 0}, - {"matrix": [0, 4], "x": 4.5, "y": 0}, - {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.5, "y": 0}, - {"matrix": [0, 10], "x": 10.5, "y": 0}, - {"matrix": [0, 11], "x": 11.5, "y": 0}, - {"matrix": [0, 12], "x": 12.5, "y": 0}, - {"matrix": [0, 13], "x": 13.5, "y": 0}, - {"matrix": [0, 14], "x": 14.5, "y": 0}, - {"matrix": [4, 14], "x": 15.5, "y": 0}, - {"matrix": [0, 15], "x": 16.5, "y": 0}, - {"matrix": [0, 16], "x": 17.5, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - - {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, - {"matrix": [1, 3], "x": 4, "y": 1}, - {"matrix": [1, 4], "x": 5, "y": 1}, - {"matrix": [1, 5], "x": 6, "y": 1}, - {"matrix": [1, 6], "x": 7, "y": 1}, - {"matrix": [1, 7], "x": 8, "y": 1}, - {"matrix": [1, 8], "x": 9, "y": 1}, - {"matrix": [1, 9], "x": 10, "y": 1}, - {"matrix": [1, 10], "x": 11, "y": 1}, - {"matrix": [1, 11], "x": 12, "y": 1}, - {"matrix": [1, 12], "x": 13, "y": 1}, - {"matrix": [1, 13], "x": 14, "y": 1}, - {"matrix": [1, 14], "x": 15, "y": 1}, - {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, - {"matrix": [1, 16], "x": 17.5, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - - {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, - {"matrix": [2, 3], "x": 4.25, "y": 2}, - {"matrix": [2, 4], "x": 5.25, "y": 2}, - {"matrix": [2, 5], "x": 6.25, "y": 2}, - {"matrix": [2, 6], "x": 7.25, "y": 2}, - {"matrix": [2, 7], "x": 8.25, "y": 2}, - {"matrix": [2, 8], "x": 9.25, "y": 2}, - {"matrix": [2, 9], "x": 10.25, "y": 2}, - {"matrix": [2, 10], "x": 11.25, "y": 2}, - {"matrix": [2, 11], "x": 12.25, "y": 2}, - {"matrix": [2, 12], "x": 13.25, "y": 2}, - {"matrix": [2, 13], "x": 14.25, "y": 2}, - {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, - {"matrix": [2, 16], "x": 17.5, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - - {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, - {"matrix": [4, 5], "x": 3.75, "y": 3}, - {"matrix": [3, 3], "x": 4.75, "y": 3}, - {"matrix": [3, 4], "x": 5.75, "y": 3}, - {"matrix": [3, 5], "x": 6.75, "y": 3}, - {"matrix": [3, 6], "x": 7.75, "y": 3}, - {"matrix": [3, 7], "x": 8.75, "y": 3}, - {"matrix": [3, 8], "x": 9.75, "y": 3}, - {"matrix": [3, 9], "x": 10.75, "y": 3}, - {"matrix": [3, 10], "x": 11.75, "y": 3}, - {"matrix": [3, 11], "x": 12.75, "y": 3}, - {"matrix": [3, 12], "x": 13.75, "y": 3}, - {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, - {"matrix": [3, 15], "x": 16.5, "y": 3}, - {"matrix": [3, 16], "x": 17.5, "y": 3}, - - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, - {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, - {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}, - - {"matrix": [4, 13], "x": 15.5, "y": 4}, - {"matrix": [4, 15], "x": 16.5, "y": 4}, - {"matrix": [4, 16], "x": 17.5, "y": 4} + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "`", "matrix": [4, 14], "x": 15.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"label": "\\", "matrix": [4, 5], "x": 3.75, "y": 3}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_blocker": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_blocker_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "`", "matrix": [4, 14], "x": 15.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_blocker_tsangan": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 3], "x": 4, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 7], "x": 6.5, "y": 4, "w": 7}, + {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "`", "matrix": [4, 14], "x": 15.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Up", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Page Down", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 3], "x": 4, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 7], "x": 6.5, "y": 4, "w": 7}, + {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}, + + {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} ] } } diff --git a/keyboards/dztech/bocc/keymaps/default/keymap.c b/keyboards/dztech/bocc/keymaps/default/keymap.c index eaff37a58d..58efc40d2c 100755 --- a/keyboards/dztech/bocc/keymaps/default/keymap.c +++ b/keyboards/dztech/bocc/keymaps/default/keymap.c @@ -17,11 +17,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_all( - KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, - KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_F5, KC_F6, KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_F7, KC_F8, KC_LSFT,KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_all( + KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, + KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_F7, KC_F8, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), }; diff --git a/keyboards/dztech/bocc/keymaps/via/keymap.c b/keyboards/dztech/bocc/keymaps/via/keymap.c index 00f9a27e82..951eee5a75 100755 --- a/keyboards/dztech/bocc/keymaps/via/keymap.c +++ b/keyboards/dztech/bocc/keymaps/via/keymap.c @@ -17,32 +17,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - LAYOUT_all( - KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, - KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_F7, KC_F8, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT_all( + KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC, KC_HOME, + KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_F5, KC_F6, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_F7, KC_F8, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), - LAYOUT_all( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), + [1] = LAYOUT_all( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), - LAYOUT_all( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), + [2] = LAYOUT_all( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), - LAYOUT_all( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO), + [3] = LAYOUT_all( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO + ), }; diff --git a/keyboards/dztech/bocc/matrix_diagram.md b/keyboards/dztech/bocc/matrix_diagram.md new file mode 100644 index 0000000000..c665e86a86 --- /dev/null +++ b/keyboards/dztech/bocc/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for DZTECH BOCC + +``` +┌───┬───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ +│00 │01 ││02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │0F │0G │ │0F │ 2u Backspace +├───┼───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ +│10 │11 ││12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │1G │ │ │ +├───┼───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐?? │ ISO Enter +│20 │21 ││22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2G │ │?? │ │ +├───┼───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ +│30 │31 ││32 │45 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │3G │ +├───┼───┤├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ +│40 │41 ││42 │43 │44 │47 │4B │4C │ │4D │4F │4G │ +└───┴───┘└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + ┌────────┐ + │32 │ 2.25u LShift + └────────┘ + ┌─────┬───┬─────┬───────────────────────────┬─────┐ + │42 │43 │44 │47 │4C │ Blocker Tsangan + └─────┴───┴─────┴───────────────────────────┴─────┘ +``` -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/dztech/bocc/info.json | 6 +++--- keyboards/dztech/duo_s/info.json | 6 +++--- keyboards/dztech/tofu/jr/v1/info.json | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/bocc/info.json b/keyboards/dztech/bocc/info.json index 5113532c7a..525ec93947 100644 --- a/keyboards/dztech/bocc/info.json +++ b/keyboards/dztech/bocc/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "BOCC", + "keyboard_name": "BOCC", "manufacturer": "DZTECH", - "url": "", - "maintainer": "DZTECH", + "url": "", + "maintainer": "DZTECH", "usb": { "vid": "0x445A", "pid": "0x1010", diff --git a/keyboards/dztech/duo_s/info.json b/keyboards/dztech/duo_s/info.json index 9c61c0303a..3d806edf41 100644 --- a/keyboards/dztech/duo_s/info.json +++ b/keyboards/dztech/duo_s/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "DUO-S", + "keyboard_name": "DUO-S", "manufacturer": "DZTECH", - "url": "", - "maintainer": "moyi4681", + "url": "", + "maintainer": "moyi4681", "usb": { "vid": "0x445A", "pid": "0x1012", diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index 338c040255..9c36a687b7 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -169,4 +169,3 @@ } } } - -- cgit v1.2.3 From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 May 2023 12:19:34 +1000 Subject: More `info.json` whitespace cleanups (#20665) --- keyboards/dztech/tofu/ii/v1/info.json | 264 +++++++++++++++++----------------- 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json index bce81094c2..d8216891cd 100644 --- a/keyboards/dztech/tofu/ii/v1/info.json +++ b/keyboards/dztech/tofu/ii/v1/info.json @@ -18,72 +18,72 @@ "rgb_matrix": { "driver": "IS31FL3737", "layout": [ - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 }, - { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 }, - { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 }, - { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 }, - { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 }, - { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 }, - { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 }, - { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 }, - { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, - { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 }, - { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 }, - { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 }, - { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 }, - { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 }, - { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 }, - { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 }, - { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 }, - { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 }, - { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 }, - { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 }, - { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 }, - { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 }, - { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 }, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, - { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 }, - { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 }, - { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 }, - { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 }, - { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 }, - { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 }, - { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 }, - { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 }, - { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 }, - { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 }, - { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 }, - { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 }, - { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 }, - { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 }, - { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 }, - { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 }, - { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 }, - { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 }, - { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 }, - { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 }, - { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 }, - { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 }, - { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 }, - { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 }, - { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 }, - { "flags": 1, "matrix": [4, 8], "x": 151, "y": 64 }, - { "flags": 1, "matrix": [4, 10], "x": 170, "y": 64 }, - { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 }, - { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 }, - { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 } + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0}, + {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0}, + {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, + {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0}, + {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0}, + {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, + {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16}, + {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16}, + {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16}, + {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16}, + {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16}, + {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16}, + {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16}, + {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16}, + {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16}, + {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16}, + {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16}, + {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16}, + {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16}, + {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16}, + {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, + {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32}, + {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, + {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32}, + {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32}, + {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32}, + {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32}, + {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32}, + {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32}, + {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32}, + {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32}, + {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32}, + {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32}, + {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32}, + {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48}, + {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48}, + {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48}, + {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48}, + {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48}, + {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48}, + {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48}, + {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48}, + {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48}, + {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48}, + {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48}, + {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48}, + {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48}, + {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64}, + {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64}, + {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64}, + {"flags": 1, "matrix": [4, 8], "x": 151, "y": 64}, + {"flags": 1, "matrix": [4, 10], "x": 170, "y": 64}, + {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64}, + {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64}, + {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64} ] }, "usb": { @@ -94,72 +94,72 @@ "layouts": { "LAYOUT": { "layout": [ - { "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": [0, 12], "x": 12, "y": 0 }, - { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "x": 15, "y": 0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "x": 15, "y": 1 }, - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "x": 15, "y": 2 }, - { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "x": 11.25, "y": 3 }, - { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "x": 14, "y": 3 }, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 }, - { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [4, 12], "x": 13, "y": 4 }, - { "matrix": [4, 13], "x": 14, "y": 4 }, - { "matrix": [4, 14], "x": 15, "y": 4 } + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "w": 2, "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4}, + {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4}, + {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4}, + {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4}, + {"matrix": [4, 8], "w": 1.25, "x": 10, "y": 4}, + {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } -- cgit v1.2.3 From ef6a712899f4ac3cf75f989221351c1cfb57f3b9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 May 2023 19:09:59 +1000 Subject: Even more `info.json` whitespace cleanups (#20703) --- keyboards/dztech/og60/info.json | 738 +++++++++++++++++----------------- keyboards/dztech/tofu/jr/v1/info.json | 272 ++++++------- 2 files changed, 505 insertions(+), 505 deletions(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/og60/info.json b/keyboards/dztech/og60/info.json index 0c86494f50..52c4e0b189 100644 --- a/keyboards/dztech/og60/info.json +++ b/keyboards/dztech/og60/info.json @@ -29,418 +29,418 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_hhkb": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 }, - { "label": "Backspace", "matrix": [2, 12], "x": 14, "y": 0 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [2, 12], "x": 14, "y": 0}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "matrix": [3, 13], "x": 14, "y": 3 }, - { "label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 }, - { "label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7 }, - { "label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5 }, - { "label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4 } + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12.5, "y": 4} ] }, "LAYOUT_60_iso": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "@", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "~", "matrix": [1, 13], "x": 12.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "@", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "~", "matrix": [1, 13], "x": 12.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 }, - { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "AltGr", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "AltGr", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] }, "LAYOUT_60_ansi_tsangan": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 }, - { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 }, - { "label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7 }, - { "label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5 }, - { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 }, - { "label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_60_tsangan_hhkb": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 }, - { "label": "Backspace", "matrix": [2, 12], "x": 14, "y": 0 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [2, 12], "x": 14, "y": 0}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "matrix": [3, 13], "x": 14, "y": 3 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 }, - { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 }, - { "label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7 }, - { "label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5 }, - { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 }, - { "label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "K47", "matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] }, "LAYOUT_all": { "layout": [ - { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Del", "matrix": [2, 12], "x": 13, "y": 0 }, - { "label": "Backspace", "matrix": [0, 13], "x": 14, "y": 0 }, + {"label": "~", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": ")", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Del", "matrix": [2, 12], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 14, "y": 0}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 }, - { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "matrix": [3, 13], "x": 14, "y": 3 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "|", "matrix": [3, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25 }, - { "label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "K47", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Win", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index 9c36a687b7..0959289a7d 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -18,74 +18,74 @@ "rgb_matrix": { "driver": "IS31FL3737", "layout": [ - { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 }, - { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 }, - { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 }, - { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 }, - { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 }, - { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 }, - { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 }, - { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 }, - { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 }, - { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 }, - { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 }, - { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 }, - { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 }, - { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 }, - { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 }, - { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 }, - { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 }, - { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 }, - { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 }, - { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 }, - { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 }, - { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 }, - { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 }, - { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 }, - { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 }, - { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 }, - { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 }, - { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 }, - { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 }, - { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 }, - { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 }, - { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 }, - { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 }, - { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 }, - { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 }, - { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 }, - { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 }, - { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 }, - { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 }, - { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 }, - { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 }, - { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 }, - { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 }, - { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 }, - { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 }, - { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 }, - { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 }, - { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 }, - { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 }, - { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 }, - { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 }, - { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 }, - { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 }, - { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 }, - { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 }, - { "flags": 1, "matrix": [3, 14], "x": 224, "y": 48 }, - { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 }, - { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 }, - { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 }, - { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 }, - { "flags": 1, "matrix": [4, 8], "x": 150, "y": 64 }, - { "flags": 1, "matrix": [4, 9], "x": 165, "y": 64 }, - { "flags": 1, "matrix": [4, 10], "x": 180, "y": 64 }, - { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 }, - { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 }, - { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 } + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0}, + {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0}, + {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0}, + {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0}, + {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0}, + {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16}, + {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16}, + {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16}, + {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16}, + {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16}, + {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16}, + {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16}, + {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16}, + {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16}, + {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16}, + {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16}, + {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16}, + {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16}, + {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16}, + {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16}, + {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32}, + {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32}, + {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32}, + {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32}, + {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32}, + {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32}, + {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32}, + {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32}, + {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32}, + {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32}, + {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32}, + {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32}, + {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32}, + {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32}, + {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48}, + {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48}, + {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48}, + {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48}, + {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48}, + {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48}, + {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48}, + {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48}, + {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48}, + {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48}, + {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48}, + {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48}, + {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48}, + {"flags": 1, "matrix": [3, 14], "x": 224, "y": 48}, + {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64}, + {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64}, + {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64}, + {"flags": 1, "matrix": [4, 8], "x": 150, "y": 64}, + {"flags": 1, "matrix": [4, 9], "x": 165, "y": 64}, + {"flags": 1, "matrix": [4, 10], "x": 180, "y": 64}, + {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64}, + {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64}, + {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64} ] }, "usb": { @@ -97,74 +97,74 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - { "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": [0, 12], "x": 12, "y": 0 }, - { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "x": 15, "y": 0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "x": 15, "y": 1 }, - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "x": 15, "y": 2 }, - { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "x": 11.25, "y": 3 }, - { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "x": 14, "y": 3 }, - { "matrix": [3, 14], "x": 15, "y": 3 }, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 8], "x": 10, "y": 4 }, - { "matrix": [4, 9], "x": 11, "y": 4 }, - { "matrix": [4, 10], "x": 12, "y": 4 }, - { "matrix": [4, 12], "x": 13, "y": 4 }, - { "matrix": [4, 13], "x": 14, "y": 4 }, - { "matrix": [4, 14], "x": 15, "y": 4 } + {"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": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "w": 2, "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4}, + {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4}, + {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4}, + {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } -- cgit v1.2.3 From c3c51231ccaea5f46684c7ce19fbc18068fa07c7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 9 May 2023 17:52:03 +1000 Subject: Clean up trailing commas from info.json (#20812) --- keyboards/dztech/tofu/jr/v1/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json index 0959289a7d..ef9bc6b903 100644 --- a/keyboards/dztech/tofu/jr/v1/info.json +++ b/keyboards/dztech/tofu/jr/v1/info.json @@ -9,7 +9,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true, + "rgb_matrix": true }, "matrix_pins": { "cols": ["GP25", "GP24", "GP23", "GP1", "GP7", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12"], -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/dztech/endless80/config.h | 1 - keyboards/dztech/endless80/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/dztech') diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h index eb512c52de..d02f837169 100644 --- a/keyboards/dztech/endless80/config.h +++ b/keyboards/dztech/endless80/config.h @@ -31,4 +31,3 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json index df23b681e8..9fb8bc22ed 100644 --- a/keyboards/dztech/endless80/info.json +++ b/keyboards/dztech/endless80/info.json @@ -20,6 +20,9 @@ "ws2812": { "pin": "F7" }, + "rgblight": { + "max_brightness": 130 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan"], -- cgit v1.2.3