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/handwired/daishi/daishi.h | 23 --- keyboards/handwired/daishi/info.json | 265 +++++++++++++++++++---------------- 2 files changed, 142 insertions(+), 146 deletions(-) delete mode 100644 keyboards/handwired/daishi/daishi.h (limited to 'keyboards/handwired/daishi') diff --git a/keyboards/handwired/daishi/daishi.h b/keyboards/handwired/daishi/daishi.h deleted file mode 100644 index 0d0c57ab20..0000000000 --- a/keyboards/handwired/daishi/daishi.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5D, K5E, K5F, K5G, K5H, \ - K60, K61, K62, K65, K69, K6A, K6C, K6D, K6E, K6F, K6G \ -){ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E, K4F, K4G, K4H }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO, K5D, K5E, K5F, K5G, K5H }, \ - { K60, K61, K62, KC_NO, KC_NO, K65, KC_NO, KC_NO, KC_NO, K69, K6A, KC_NO, K6C, K6D, K6E, K6F, K6G, KC_NO } \ -} diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json index 7bd1c6dd8d..37d80633a7 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/info.json @@ -23,129 +23,148 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - {"x":18.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4.33, "y":1.25}, - {"x":5.33, "y":1.25}, - {"x":6.33, "y":1.25}, - {"x":7.33, "y":1.25}, - {"x":8.67, "y":1.25}, - {"x":9.67, "y":1.25}, - {"x":10.67, "y":1.25}, - {"x":11.67, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.5, "y":1.25}, - {"x":18.5, "y":1.25}, - - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, - {"x":4, "y":2.5}, - {"x":5, "y":2.5}, - {"x":6, "y":2.5}, - {"x":7, "y":2.5}, - {"x":8, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.5}, - {"x":11, "y":2.5}, - {"x":12, "y":2.5}, - {"x":13, "y":2.5, "w":2}, - {"x":15.25, "y":2.25}, - {"x":16.5, "y":2.5}, - {"x":17.5, "y":2.5}, - {"x":18.5, "y":2.5}, - - {"x":0, "y":3.5, "w":1.5}, - {"x":1.5, "y":3.5}, - {"x":2.5, "y":3.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.5}, - {"x":6.5, "y":3.5}, - {"x":7.5, "y":3.5}, - {"x":8.5, "y":3.5}, - {"x":9.5, "y":3.5}, - {"x":10.5, "y":3.5}, - {"x":11.5, "y":3.5}, - {"x":12.5, "y":3.5}, - {"x":13.5, "y":3.5, "w":1.5}, - {"x":15.5, "y":3.5}, - {"x":16.5, "y":3.5}, - {"x":17.5, "y":3.5}, - {"x":18.5, "y":3.5}, - - {"x":0, "y":4.5, "w":1.75}, - {"x":1.75, "y":4.5}, - {"x":2.75, "y":4.5}, - {"x":3.75, "y":4.5}, - {"x":4.75, "y":4.5}, - {"x":5.75, "y":4.5}, - {"x":6.75, "y":4.5}, - {"x":7.75, "y":4.5}, - {"x":8.75, "y":4.5}, - {"x":9.75, "y":4.5}, - {"x":10.75, "y":4.5}, - {"x":11.75, "y":4.5}, - {"x":12.75, "y":4.5, "w":2.25}, - {"x":15.5, "y":4.5}, - {"x":16.5, "y":4.5}, - {"x":17.5, "y":4.5}, - {"x":18.5, "y":4.5}, - - {"x":0, "y":5.5, "w":2.25}, - {"x":2.25, "y":5.5}, - {"x":3.25, "y":5.5}, - {"x":4.25, "y":5.5}, - {"x":5.25, "y":5.5}, - {"x":6.25, "y":5.5}, - {"x":7.25, "y":5.5}, - {"x":8.25, "y":5.5}, - {"x":9.25, "y":5.5}, - {"x":10.25, "y":5.5}, - {"x":11.25, "y":5.5}, - {"x":12.25, "y":5.5, "w":1.75}, - {"x":14.25, "y":5.75}, - {"x":15.5, "y":5.5}, - {"x":16.5, "y":5.5}, - {"x":17.5, "y":5.5}, - {"x":18.5, "y":5.5, "h":2}, - - {"x":0, "y":6.5, "w":1.25}, - {"x":1.25, "y":6.5, "w":1.25}, - {"x":2.5, "y":6.5, "w":1.25}, - {"x":3.75, "y":6.5, "w":6.25}, - {"x":10, "y":6.5, "w":1.5}, - {"x":11.5, "y":6.5, "w":1.5}, - {"x":13.25, "y":6.75}, - {"x":14.25, "y":6.75}, - {"x":15.25, "y":6.75}, - {"x":16.5, "y":6.5}, - {"x":17.5, "y":6.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "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.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [0, 13], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [0, 17], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [1, 4], "x": 4.33, "y": 1.25}, + {"matrix": [1, 5], "x": 5.33, "y": 1.25}, + {"matrix": [1, 6], "x": 6.33, "y": 1.25}, + {"matrix": [1, 7], "x": 7.33, "y": 1.25}, + + {"matrix": [1, 8], "x": 8.67, "y": 1.25}, + {"matrix": [1, 9], "x": 9.67, "y": 1.25}, + {"matrix": [1, 10], "x": 10.67, "y": 1.25}, + {"matrix": [1, 11], "x": 11.67, "y": 1.25}, + + {"matrix": [1, 12], "x": 13, "y": 1.25}, + + {"matrix": [1, 13], "x": 14.25, "y": 1.25}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + + {"matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"matrix": [1, 17], "x": 18.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + {"matrix": [2, 7], "x": 7, "y": 2.5}, + {"matrix": [2, 8], "x": 8, "y": 2.5}, + {"matrix": [2, 9], "x": 9, "y": 2.5}, + {"matrix": [2, 10], "x": 10, "y": 2.5}, + {"matrix": [2, 11], "x": 11, "y": 2.5}, + {"matrix": [2, 12], "x": 12, "y": 2.5}, + {"matrix": [2, 13], "x": 13, "y": 2.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + {"matrix": [3, 13], "x": 13.5, "y": 3.5, "w": 1.5}, + + {"matrix": [3, 14], "x": 15.5, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4.5}, + {"matrix": [4, 2], "x": 2.75, "y": 4.5}, + {"matrix": [4, 3], "x": 3.75, "y": 4.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5, "w": 2.25}, + + {"matrix": [4, 14], "x": 15.5, "y": 4.5}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2.25}, + {"matrix": [5, 1], "x": 2.25, "y": 5.5}, + {"matrix": [5, 2], "x": 3.25, "y": 5.5}, + {"matrix": [5, 3], "x": 4.25, "y": 5.5}, + {"matrix": [5, 4], "x": 5.25, "y": 5.5}, + {"matrix": [5, 5], "x": 6.25, "y": 5.5}, + {"matrix": [5, 6], "x": 7.25, "y": 5.5}, + {"matrix": [5, 7], "x": 8.25, "y": 5.5}, + {"matrix": [5, 8], "x": 9.25, "y": 5.5}, + {"matrix": [5, 9], "x": 10.25, "y": 5.5}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.75}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + + {"matrix": [5, 14], "x": 15.5, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 6.5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 6.5, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 6.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 6.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 6.5, "w": 1.5}, + {"matrix": [6, 10], "x": 11.5, "y": 6.5, "w": 1.5}, + + {"matrix": [6, 12], "x": 13.25, "y": 6.75}, + {"matrix": [6, 13], "x": 14.25, "y": 6.75}, + {"matrix": [6, 14], "x": 15.25, "y": 6.75}, + + {"matrix": [6, 15], "x": 16.5, "y": 6.5}, + {"matrix": [6, 16], "x": 17.5, "y": 6.5} ] } } -- cgit v1.2.3