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/split65/stm32/info.json | 88 ++++++++++++++++++++++++++++- keyboards/handwired/split65/stm32/stm32.h | 38 ------------- 2 files changed, 87 insertions(+), 39 deletions(-) delete mode 100644 keyboards/handwired/split65/stm32/stm32.h (limited to 'keyboards/handwired/split65/stm32') diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index e2c0a634f3..b9956ed7ab 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -9,5 +9,91 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0, "w": 2}, + {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"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": [9, 7], "x": 7.75, "y": 2}, + {"matrix": [7, 7], "x": 8.75, "y": 2}, + {"matrix": [7, 6], "x": 9.75, "y": 2}, + {"matrix": [7, 5], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2}, + {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [8, 7], "x": 8.25, "y": 3}, + {"matrix": [8, 6], "x": 9.25, "y": 3}, + {"matrix": [8, 5], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25}, + {"matrix": [9, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4}, + + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h deleted file mode 100644 index be3dd1639b..0000000000 --- a/keyboards/handwired/split65/stm32/stm32.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 - * - * 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 LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \ - ) \ - { \ - {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \ - {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \ - {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \ - {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \ - {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \ - {R00, R01, R02, R03, R04, R05, R06, R07}, \ - {R10, R11, R12, R13, R14, R15, R16, R17}, \ - {R20, R21, R22, R23, R24, R25, R26, R27}, \ - {R30, R31, R32, R33, R34, R35, R36, R37}, \ - {R40, R41, R42, R43, R44, R45, R46, R47} \ - } -- cgit v1.2.3