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/ydkb/grape/grape.h | 47 -------- keyboards/ydkb/grape/info.json | 258 ++++++++++++++++++++++------------------- 2 files changed, 139 insertions(+), 166 deletions(-) delete mode 100644 keyboards/ydkb/grape/grape.h (limited to 'keyboards/ydkb/grape') diff --git a/keyboards/ydkb/grape/grape.h b/keyboards/ydkb/grape/grape.h deleted file mode 100644 index 0f20f7ea8a..0000000000 --- a/keyboards/ydkb/grape/grape.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2022 somepin - * - * 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 - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_all( \ - K0A, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L, K0N, K0P, K0Q, K0R, K0S, \ - K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1P, K1Q, K1R, K1S, \ - K2P, K2Q, K2R, K2S, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K1N, K3P, K3Q, K3R, K3S, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K4P, K4Q, K4R, K4S, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4N, K5Q, K5R, K5S, \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K4M, K5N, K6Q, K6R, K6S, \ - K6A, K6B, K6C, K6E, K6F, K6H, K6I, K6J, K6K, K6L, K6M, K6N, K5P, K6P \ -) { \ - { K0A, XXX, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L, XXX, K0N, K0P, K0Q, K0R, K0S }, \ - { XXX, XXX, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, XXX, K1N, K1P, K1Q, K1R, K1S }, \ - { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2P, K2Q, K2R, K2S }, \ - { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, K3Q, K3R, K3S }, \ - { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4P, K4Q, K4R, K4S }, \ - { K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5P, K5Q, K5R, K5S }, \ - { K6A, K6B, K6C, XXX, K6E, K6F, XXX, K6H, K6I, K6J, K6K, K6L, K6M, K6N, K6P, K6Q, K6R, K6S } \ -} diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json index 911b5cf831..6c5123f9fd 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/info.json @@ -26,125 +26,145 @@ "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, "y": 0 }, - { "label": "F6", "x": 7, "y": 0 }, - { "label": "Insert", "x": 8.5, "y": 0 }, - { "label": "Home", "x": 9.5, "y": 0 }, - { "label": "PgUp", "x": 10.5, "y": 0 }, - { "label": "PrtSc", "x": 11.5, "y": 0 }, - { "label": "Pause", "x": 13, "y": 0 }, - { "label": "Num Lock", "x": 16, "y": 0 }, - { "label": "/", "x": 17, "y": 0 }, - { "label": "*", "x": 18, "y": 0 }, - { "label": "-", "x": 19, "y": 0 }, - { "label": "F7", "x": 2, "y": 1 }, - { "label": "F8", "x": 3, "y": 1 }, - { "label": "F9", "x": 4, "y": 1 }, - { "label": "F10", "x": 5, "y": 1 }, - { "label": "F11", "x": 6, "y": 1 }, - { "label": "F12", "x": 7, "y": 1 }, - { "label": "Delete", "x": 8.5, "y": 1 }, - { "label": "End", "x": 9.5, "y": 1 }, - { "label": "PgDn", "x": 10.5, "y": 1 }, - { "label": "Scroll Lock", "x": 11.5, "y": 1 }, - { "label": "7", "x": 16, "y": 1 }, - { "label": "8", "x": 17, "y": 1 }, - { "label": "9", "x": 18, "y": 1 }, - { "label": "+", "x": 19, "y": 1 }, - { "label": "4", "x": 16, "y": 2 }, - { "label": "5", "x": 17, "y": 2 }, - { "label": "6", "x": 18, "y": 2 }, - { "label": "+", "x": 19, "y": 2 }, - { "label": "~", "x": 0, "y": 3 }, - { "label": "!", "x": 1, "y": 3 }, - { "label": "@", "x": 2, "y": 3 }, - { "label": "#", "x": 3, "y": 3 }, - { "label": "$", "x": 4, "y": 3 }, - { "label": "%", "x": 5, "y": 3 }, - { "label": "^", "x": 6, "y": 3 }, - { "label": "&", "x": 7, "y": 3 }, - { "label": "*", "x": 8, "y": 3 }, - { "label": "(", "x": 9, "y": 3 }, - { "label": ")", "x": 10, "y": 3 }, - { "label": "_", "x": 11, "y": 3 }, - { "label": "+", "x": 12, "y": 3 }, - { "label": "Bksp", "x": 13, "y": 3 }, - { "label": "Bksp", "x": 14, "y": 3 }, - { "label": "1", "x": 16, "y": 3 }, - { "label": "2", "x": 17, "y": 3 }, - { "label": "3", "x": 18, "y": 3 }, - { "label": "Enter", "x": 19, "y": 3 }, - { "label": "Tab", "x": 0, "y": 4, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 4 }, - { "label": "W", "x": 2.5, "y": 4 }, - { "label": "E", "x": 3.5, "y": 4 }, - { "label": "R", "x": 4.5, "y": 4 }, - { "label": "T", "x": 5.5, "y": 4 }, - { "label": "Y", "x": 6.5, "y": 4 }, - { "label": "U", "x": 7.5, "y": 4 }, - { "label": "I", "x": 8.5, "y": 4 }, - { "label": "O", "x": 9.5, "y": 4 }, - { "label": "P", "x": 10.5, "y": 4 }, - { "label": "{", "x": 11.5, "y": 4 }, - { "label": "}", "x": 12.5, "y": 4 }, - { "label": "|", "x": 13.5, "y": 4, "w": 1.5 }, - { "label": "0", "x": 16, "y": 4 }, - { "label": "0", "x": 17, "y": 4 }, - { "label": ".", "x": 18, "y": 4 }, - { "label": "Enter", "x": 19, "y": 4 }, - { "label": "Caps Lock", "x": 0, "y": 5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 5 }, - { "label": "S", "x": 2.75, "y": 5 }, - { "label": "D", "x": 3.75, "y": 5 }, - { "label": "F", "x": 4.75, "y": 5 }, - { "label": "G", "x": 5.75, "y": 5 }, - { "label": "H", "x": 6.75, "y": 5 }, - { "label": "J", "x": 7.75, "y": 5 }, - { "label": "K", "x": 8.75, "y": 5 }, - { "label": "L", "x": 9.75, "y": 5 }, - { "label": ":", "x": 10.75, "y": 5 }, - { "label": "\"", "x": 11.75, "y": 5 }, - { "label": "Enter", "x": 12.75, "y": 5, "w": 2.25 }, - { "label": "F13", "x": 16.5, "y": 5.25 }, - { "label": "F14", "x": 17.5, "y": 5.25 }, - { "label": "F15", "x": 18.5, "y": 5.25 }, - { "label": "Shift", "x": 0, "y": 6, "w": 1.25 }, - { "label": "Shift", "x": 1.25, "y": 6 }, - { "label": "Z", "x": 2.25, "y": 6 }, - { "label": "X", "x": 3.25, "y": 6 }, - { "label": "C", "x": 4.25, "y": 6 }, - { "label": "V", "x": 5.25, "y": 6 }, - { "label": "B", "x": 6.25, "y": 6 }, - { "label": "N", "x": 7.25, "y": 6 }, - { "label": "M", "x": 8.25, "y": 6 }, - { "label": "<", "x": 9.25, "y": 6 }, - { "label": ">", "x": 10.25, "y": 6 }, - { "label": "?", "x": 11.25, "y": 6 }, - { "label": "Shift", "x": 12.25, "y": 6 }, - { "label": "Shift", "x": 13.25, "y": 6 }, - { "label": "\u2191", "x": 14.5, "y": 6.25 }, - { "label": "F16", "x": 16.5, "y": 6.25 }, - { "label": "F17", "x": 17.5, "y": 6.25 }, - { "label": "F18", "x": 18.5, "y": 6.25 }, - { "label": "Ctrl", "x": 0, "y": 7 }, - { "label": "Win", "x": 1, "y": 7 }, - { "label": "Alt", "x": 2, "y": 7 }, - { "x": 3, "y": 7, "w": 3 }, - { "x": 6, "y": 7, "w": 3 }, - { "label": "Alt", "x": 9, "y": 7 }, - { "label": "Win", "x": 10, "y": 7 }, - { "label": "Menu", "x": 11, "y": 7 }, - { "label": "Ctrl", "x": 12, "y": 7 }, - { "label": "\u2190", "x": 13.5, "y": 7.25 }, - { "label": "\u2193", "x": 14.5, "y": 7.25 }, - { "label": "\u2192", "x": 15.5, "y": 7.25 }, - { "label": "BTN1", "x": 17, "y": 7.25 }, - { "label": "BTN2", "x": 18, "y": 7.25 } + {"matrix": [0, 0], "x": 0, "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.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, 13], "x": 13, "y": 0}, + + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 15], "x": 17, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "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, 14], "x": 16, "y": 1}, + {"matrix": [1, 15], "x": 17, "y": 1}, + {"matrix": [1, 16], "x": 18, "y": 1}, + {"matrix": [1, 17], "x": 19, "y": 1}, + + {"matrix": [2, 14], "x": 16, "y": 2}, + {"matrix": [2, 15], "x": 17, "y": 2}, + {"matrix": [2, 16], "x": 18, "y": 2}, + {"matrix": [2, 17], "x": 19, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + {"matrix": [2, 6], "x": 6, "y": 3}, + {"matrix": [2, 7], "x": 7, "y": 3}, + {"matrix": [2, 8], "x": 8, "y": 3}, + {"matrix": [2, 9], "x": 9, "y": 3}, + {"matrix": [2, 10], "x": 10, "y": 3}, + {"matrix": [2, 11], "x": 11, "y": 3}, + {"matrix": [2, 12], "x": 12, "y": 3}, + {"matrix": [2, 13], "x": 13, "y": 3}, + {"matrix": [1, 13], "x": 14, "y": 3}, + + {"matrix": [3, 14], "x": 16, "y": 3}, + {"matrix": [3, 15], "x": 17, "y": 3}, + {"matrix": [3, 16], "x": 18, "y": 3}, + {"matrix": [3, 17], "x": 19, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 4}, + {"matrix": [3, 2], "x": 2.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 4}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, + {"matrix": [3, 5], "x": 5.5, "y": 4}, + {"matrix": [3, 6], "x": 6.5, "y": 4}, + {"matrix": [3, 7], "x": 7.5, "y": 4}, + {"matrix": [3, 8], "x": 8.5, "y": 4}, + {"matrix": [3, 9], "x": 9.5, "y": 4}, + {"matrix": [3, 10], "x": 10.5, "y": 4}, + {"matrix": [3, 11], "x": 11.5, "y": 4}, + {"matrix": [3, 12], "x": 12.5, "y": 4}, + {"matrix": [3, 13], "x": 13.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 14], "x": 16, "y": 4}, + {"matrix": [4, 15], "x": 17, "y": 4}, + {"matrix": [4, 16], "x": 18, "y": 4}, + {"matrix": [4, 17], "x": 19, "y": 4}, + + {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 5}, + {"matrix": [4, 2], "x": 2.75, "y": 5}, + {"matrix": [4, 3], "x": 3.75, "y": 5}, + {"matrix": [4, 4], "x": 4.75, "y": 5}, + {"matrix": [4, 5], "x": 5.75, "y": 5}, + {"matrix": [4, 6], "x": 6.75, "y": 5}, + {"matrix": [4, 7], "x": 7.75, "y": 5}, + {"matrix": [4, 8], "x": 8.75, "y": 5}, + {"matrix": [4, 9], "x": 9.75, "y": 5}, + {"matrix": [4, 10], "x": 10.75, "y": 5}, + {"matrix": [4, 11], "x": 11.75, "y": 5}, + {"matrix": [4, 13], "x": 12.75, "y": 5, "w": 2.25}, + + {"matrix": [5, 15], "x": 16.5, "y": 5.25}, + {"matrix": [5, 16], "x": 17.5, "y": 5.25}, + {"matrix": [5, 17], "x": 18.5, "y": 5.25}, + + {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 6}, + {"matrix": [5, 2], "x": 2.25, "y": 6}, + {"matrix": [5, 3], "x": 3.25, "y": 6}, + {"matrix": [5, 4], "x": 4.25, "y": 6}, + {"matrix": [5, 5], "x": 5.25, "y": 6}, + {"matrix": [5, 6], "x": 6.25, "y": 6}, + {"matrix": [5, 7], "x": 7.25, "y": 6}, + {"matrix": [5, 8], "x": 8.25, "y": 6}, + {"matrix": [5, 9], "x": 9.25, "y": 6}, + {"matrix": [5, 10], "x": 10.25, "y": 6}, + {"matrix": [5, 11], "x": 11.25, "y": 6}, + {"matrix": [5, 12], "x": 12.25, "y": 6}, + {"matrix": [4, 12], "x": 13.25, "y": 6}, + + {"matrix": [5, 13], "x": 14.5, "y": 6.25}, + + {"matrix": [6, 15], "x": 16.5, "y": 6.25}, + {"matrix": [6, 16], "x": 17.5, "y": 6.25}, + {"matrix": [6, 17], "x": 18.5, "y": 6.25}, + + {"matrix": [6, 0], "x": 0, "y": 7}, + {"matrix": [6, 1], "x": 1, "y": 7}, + {"matrix": [6, 2], "x": 2, "y": 7}, + {"matrix": [6, 4], "x": 3, "y": 7, "w": 3}, + {"matrix": [6, 5], "x": 6, "y": 7, "w": 3}, + {"matrix": [6, 7], "x": 9, "y": 7}, + {"matrix": [6, 8], "x": 10, "y": 7}, + {"matrix": [6, 9], "x": 11, "y": 7}, + {"matrix": [6, 10], "x": 12, "y": 7}, + + {"matrix": [6, 11], "x": 13.5, "y": 7.25}, + {"matrix": [6, 12], "x": 14.5, "y": 7.25}, + {"matrix": [6, 13], "x": 15.5, "y": 7.25}, + + {"matrix": [5, 14], "x": 17, "y": 7.25}, + {"matrix": [6, 14], "x": 18, "y": 7.25} ] } } -- cgit v1.2.3