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/ymdk/ymd67/info.json | 138 +++++++++++++++++++++-------------------- keyboards/ymdk/ymd67/ymd67.h | 17 ----- 2 files changed, 71 insertions(+), 84 deletions(-) delete mode 100644 keyboards/ymdk/ymd67/ymd67.h (limited to 'keyboards/ymdk/ymd67') diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index cc83eb82ac..39801fe04e 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -25,73 +25,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Esc", "x": 0, "y": 0}, - {"label": "!", "x": 1, "y": 0}, - {"label": "@", "x": 2, "y": 0}, - {"label": "#", "x": 3, "y": 0}, - {"label": "$", "x": 4, "y": 0}, - {"label": "%", "x": 5, "y": 0}, - {"label": "^", "x": 6, "y": 0}, - {"label": "&", "x": 7, "y": 0}, - {"label": "*", "x": 8, "y": 0}, - {"label": "(", "x": 9, "y": 0}, - {"label": ")", "x": 10, "y": 0}, - {"label": "_", "x": 11, "y": 0}, - {"label": "+", "x": 12, "y": 0}, - {"label": "~", "x": 13, "y": 0}, - {"label": "Bs", "x": 14, "y": 0}, - {"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}, - {"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}, - {"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": "Up", "x": 13, "y": 3}, - {"label": "Del", "x": 14, "y": 3}, - {"label": "Ctrl", "x": 0, "y": 4, "w": 1.75}, - {"label": "Win", "x": 1.75, "y": 4, "w": 1.25}, - {"label": "Alt", "x": 3, "y": 4, "w": 1.25}, - {"x": 4.25, "y": 4, "w": 1.25}, - {"x": 5.5, "y": 4, "w": 3}, - {"label": "Alt", "x": 8.5, "y": 4, "w": 1.25}, - {"label": "Ctrl", "x": 9.75, "y": 4, "w": 1.25}, - {"x": 11, "y": 4}, - {"label": "Left", "x": 12, "y": 4}, - {"label": "Down", "x": 13, "y": 4}, - {"label": "Right", "x": 14, "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], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "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": [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": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"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} ] } } diff --git a/keyboards/ymdk/ymd67/ymd67.h b/keyboards/ymdk/ymd67/ymd67.h deleted file mode 100644 index 5e7d846694..0000000000 --- a/keyboards/ymdk/ymd67/ymd67.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - 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, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K47, K48, K49, K4A, K4B, K4C, K4D \ -) { \ - { 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, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \ -} -- cgit v1.2.3