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/molecule/info.json | 85 +++++++++++++++++++++++-------------------- keyboards/molecule/molecule.h | 41 --------------------- 2 files changed, 45 insertions(+), 81 deletions(-) delete mode 100755 keyboards/molecule/molecule.h (limited to 'keyboards/molecule') diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json index aff7852107..51ca67c282 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/info.json @@ -18,50 +18,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":1}, - {"label":"W", "x":1, "y":0.25}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.5}, - {"label":"T", "x":4, "y":0.75}, - {"label":"Y", "x":9.75, "y":0.75}, - {"label":"U", "x":10.75, "y":0.5}, - {"label":"I", "x":11.75, "y":0}, - {"label":"O", "x":12.75, "y":0.25}, - {"label":"P", "x":13.75, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.75}, - {"label":"A", "x":0, "y":2}, - {"label":"S", "x":1, "y":1.25}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.5}, - {"label":"G", "x":4, "y":1.75}, - {"label":"H", "x":9.75, "y":1.75}, - {"label":"J", "x":10.75, "y":1.5}, - {"label":"K", "x":11.75, "y":1}, - {"label":"L", "x":12.75, "y":1.25}, - {"label":";", "x":13.75, "y":2}, + {"matrix": [0, 5], "x": 9.75, "y": 0.75}, + {"matrix": [0, 6], "x": 10.75, "y": 0.5}, + {"matrix": [0, 7], "x": 11.75, "y": 0}, + {"matrix": [0, 8], "x": 12.75, "y": 0.25}, + {"matrix": [0, 9], "x": 13.75, "y": 1}, - {"label":"Z", "x":0, "y":3}, - {"label":"X", "x":1, "y":2.25}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.5}, - {"label":"B", "x":4, "y":2.75}, - {"label":"N", "x":9.75, "y":2.75}, - {"label":"M", "x":10.75, "y":2.5}, - {"label":",", "x":11.75, "y":2}, - {"label":".", "x":12.75, "y":2.25}, - {"label":"/", "x":13.75, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.75}, - {"label":"Ctrl", "x":1, "y":3.25}, - {"label":"Shift", "x":2, "y":3}, - {"label":"Alt", "x":5.25, "y":3}, - {"label":"Space", "x":6.25, "y":3.25, "h":1.5}, - {"label":"Enter", "x":7.5, "y":3.25, "h":1.5}, - {"label":"Super", "x":8.5, "y":3}, - {"label":"Shift", "x":11.75, "y":3}, - {"label":"Ctrl", "x":12.75, "y":3.25}, + {"matrix": [1, 5], "x": 9.75, "y": 1.75}, + {"matrix": [1, 6], "x": 10.75, "y": 1.5}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1.25}, + {"matrix": [1, 9], "x": 13.75, "y": 2}, - {"label":"Lower", "x":5.25, "y":4}, - {"label":"Raise", "x":8.5, "y":4} + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.75}, + + {"matrix": [2, 5], "x": 9.75, "y": 2.75}, + {"matrix": [2, 6], "x": 10.75, "y": 2.5}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + {"matrix": [2, 8], "x": 12.75, "y": 2.25}, + {"matrix": [2, 9], "x": 13.75, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 3.25}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 4], "x": 6.25, "y": 3.25, "h": 1.5}, + + {"matrix": [3, 5], "x": 7.5, "y": 3.25, "h": 1.5}, + {"matrix": [3, 6], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 11.75, "y": 3}, + {"matrix": [3, 9], "x": 12.75, "y": 3.25}, + + {"matrix": [3, 2], "x": 5.25, "y": 4}, + + {"matrix": [3, 7], "x": 8.5, "y": 4} ] } } diff --git a/keyboards/molecule/molecule.h b/keyboards/molecule/molecule.h deleted file mode 100755 index a7769f89a1..0000000000 --- a/keyboards/molecule/molecule.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 bbrfkr - * - * 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( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L33, L34, R30, R31, R33, R34, \ - L32, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, R00, R01, R02, R03, R04 }, \ - { L10, L11, L12, L13, L14, R10, R11, R12, R13, R14 }, \ - { L20, L21, L22, L23, L24, R20, R21, R22, R23, R24 }, \ - { L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 }, \ - } -- cgit v1.2.3