From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/delikeeb/vaneelaex/info.json | 381 ++++++------------------------- keyboards/delikeeb/vaneelaex/vaneelaex.h | 42 ---- 2 files changed, 68 insertions(+), 355 deletions(-) delete mode 100644 keyboards/delikeeb/vaneelaex/vaneelaex.h (limited to 'keyboards/delikeeb') diff --git a/keyboards/delikeeb/vaneelaex/info.json b/keyboards/delikeeb/vaneelaex/info.json index 0095254388..752fc8c3d1 100644 --- a/keyboards/delikeeb/vaneelaex/info.json +++ b/keyboards/delikeeb/vaneelaex/info.json @@ -18,320 +18,75 @@ "layouts": { "LAYOUT_ss_6x12": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "label": "7", - "x": 1, - "y": 0 - }, - { - "label": "8", - "x": 2, - "y": 0 - }, - { - "label": "9", - "x": 3, - "y": 0 - }, - { - "label": "TAB", - "x": 4, - "y": 0 - }, - { - "label": "Q", - "x": 5, - "y": 0 - }, - { - "label": "W", - "x": 6, - "y": 0 - }, - { - "label": "E", - "x": 7, - "y": 0 - }, - { - "label": "R", - "x": 8, - "y": 0 - }, - { - "label": "T", - "x": 9, - "y": 0 - }, - { - "label": "Y", - "x": 10, - "y": 0 - }, - { - "label": "U", - "x": 11, - "y": 0 - }, - { - "label": "I", - "x": 12, - "y": 0 - }, - { - "label": "O", - "x": 13, - "y": 0 - }, - { - "label": "P", - "x": 14, - "y": 0 - }, - { - "label": "BS", - "x": 15, - "y": 0, - "w": 1.5 - }, - { - "x": 0, - "y": 1 - }, - { - "label": "4", - "x": 1, - "y": 1 - }, - { - "label": "5", - "x": 2, - "y": 1 - }, - { - "label": "6", - "x": 3, - "y": 1 - }, - { - "label": "ESC", - "x": 4, - "y": 1, - "w": 1.25 - }, - { - "label": "A", - "x": 5.25, - "y": 1 - }, - { - "label": "S", - "x": 6.25, - "y": 1 - }, - { - "label": "D", - "x": 7.25, - "y": 1 - }, - { - "label": "F", - "x": 8.25, - "y": 1 - }, - { - "label": "G", - "x": 9.25, - "y": 1 - }, - { - "label": "H", - "x": 10.25, - "y": 1 - }, - { - "label": "J", - "x": 11.25, - "y": 1 - }, - { - "label": "K", - "x": 12.25, - "y": 1 - }, - { - "label": "L", - "x": 13.25, - "y": 1 - }, - { - "label": ";", - "x": 14.25, - "y": 1 - }, - { - "label": "ENTER", - "x": 15.25, - "y": 1, - "w": 1.25 - }, - { - "x": 0, - "y": 2 - }, - { - "label": "1", - "x": 1, - "y": 2 - }, - { - "label": "2", - "x": 2, - "y": 2 - }, - { - "label": "3", - "x": 3, - "y": 2 - }, - { - "label": "SHIFT", - "x": 4, - "y": 2, - "w": 1.5 - }, - { - "label": "Z", - "x": 5.5, - "y": 2 - }, - { - "label": "X", - "x": 6.5, - "y": 2 - }, - { - "label": "C", - "x": 7.5, - "y": 2 - }, - { - "label": "V", - "x": 8.5, - "y": 2 - }, - { - "label": "B", - "x": 9.5, - "y": 2 - }, - { - "label": "N", - "x": 10.5, - "y": 2 - }, - { - "label": "M", - "x": 11.5, - "y": 2 - }, - { - "label": ",", - "x": 12.5, - "y": 2 - }, - { - "label": ".", - "x": 13.5, - "y": 2 - }, - { - "label": "/", - "x": 14.5, - "y": 2 - }, - { - "label": "SHIFT", - "x": 15.5, - "y": 2 - }, - { - "x": 0, - "y": 3 - }, - { - "x": 1, - "y": 3 - }, - { - "x": 2, - "y": 3 - }, - { - "label": "0", - "x": 3, - "y": 3 - }, - { - "label": "CTRL", - "x": 4, - "y": 3 - }, - { - "label": "GUI", - "x": 5, - "y": 3 - }, - { - "label": "ALT", - "x": 6, - "y": 3 - }, - { - "x": 7, - "y": 3 - }, - { - "label": "LOWER", - "x": 8, - "y": 3, - "w": 1.25 - }, - { - "x": 9.25, - "y": 3 - }, - { - "x": 10.25, - "y": 3 - }, - { - "label": "RAISE", - "x": 11.25, - "y": 3, - "w": 1.25 - }, - { - "x": 12.5, - "y": 3 - }, - { - "x": 13.5, - "y": 3 - }, - { - "x": 14.5, - "y": 3 - }, - { - "x": 15.5, - "y": 3 - } + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "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": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + {"matrix": [0, 11], "x": 15, "y": 0, "w": 1.5}, + + {"matrix": [4, 8], "x": 0, "y": 1}, + {"matrix": [4, 9], "x": 1, "y": 1}, + {"matrix": [4, 10], "x": 2, "y": 1}, + {"matrix": [4, 11], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1}, + {"matrix": [1, 8], "x": 12.25, "y": 1}, + {"matrix": [1, 9], "x": 13.25, "y": 1}, + {"matrix": [1, 10], "x": 14.25, "y": 1}, + {"matrix": [1, 11], "x": 15.25, "y": 1, "w": 1.25}, + + {"matrix": [4, 4], "x": 0, "y": 2}, + {"matrix": [4, 5], "x": 1, "y": 2}, + {"matrix": [4, 6], "x": 2, "y": 2}, + {"matrix": [4, 7], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 5.5, "y": 2}, + {"matrix": [2, 2], "x": 6.5, "y": 2}, + {"matrix": [2, 3], "x": 7.5, "y": 2}, + {"matrix": [2, 4], "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": 13.5, "y": 2}, + {"matrix": [2, 10], "x": 14.5, "y": 2}, + {"matrix": [2, 11], "x": 15.5, "y": 2}, + + {"matrix": [4, 0], "x": 0, "y": 3}, + {"matrix": [4, 1], "x": 1, "y": 3}, + {"matrix": [4, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 4, "y": 3}, + {"matrix": [3, 1], "x": 5, "y": 3}, + {"matrix": [3, 2], "x": 6, "y": 3}, + {"matrix": [3, 3], "x": 7, "y": 3}, + {"matrix": [3, 4], "x": 8, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 9.25, "y": 3}, + {"matrix": [3, 6], "x": 10.25, "y": 3}, + {"matrix": [3, 7], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 12.5, "y": 3}, + {"matrix": [3, 9], "x": 13.5, "y": 3}, + {"matrix": [3, 10], "x": 14.5, "y": 3}, + {"matrix": [3, 11], "x": 15.5, "y": 3} ] } } + } diff --git a/keyboards/delikeeb/vaneelaex/vaneelaex.h b/keyboards/delikeeb/vaneelaex/vaneelaex.h deleted file mode 100644 index 9b2d74ecef..0000000000 --- a/keyboards/delikeeb/vaneelaex/vaneelaex.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 noclew - * - * 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" - -/* 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_ss_6x12( \ - k62, k63, k64, k65, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \ - k58, k59, k60, k61, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, \ - k54, k55, k56, k57, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, \ - k50, k51, k52, k53, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 }, \ - { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24 }, \ - { k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36 }, \ - { k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61 }, \ - { k62, k63, k64, k65, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} -- cgit v1.2.3