From 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Mar 2023 15:54:34 +1100 Subject: Move ortho & numpad layouts to data driven (#20183) Co-authored-by: Nick Brassel --- keyboards/idobao/montex/v1/info.json | 54 ++++++++++++++++++------------------ keyboards/idobao/montex/v1/v1.h | 35 ----------------------- 2 files changed, 27 insertions(+), 62 deletions(-) delete mode 100644 keyboards/idobao/montex/v1/v1.h (limited to 'keyboards/idobao/montex/v1') diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index e5c423e527..7d437655bb 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -21,38 +21,38 @@ "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - { "label": "0,0", "x": 0, "y": 0}, - { "label": "0,1", "x": 1, "y": 0}, - { "label": "0,2", "x": 2, "y": 0}, - { "label": "0,3", "x": 3, "y": 0}, - { "label": "0,4", "x": 4, "y": 0}, + {"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}, - { "label": "1,0", "x": 0, "y": 1.25}, - { "label": "1,1", "x": 1, "y": 1.25}, - { "label": "1,2", "x": 2, "y": 1.25}, - { "label": "1,3", "x": 3, "y": 1.25}, - { "label": "1,4", "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, - { "label": "2,0", "x": 0, "y": 2.25}, - { "label": "2,1", "x": 1, "y": 2.25}, - { "label": "2,2", "x": 2, "y": 2.25}, - { "label": "2,3", "x": 3, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, - { "label": "3,0", "x": 0, "y": 3.25}, - { "label": "3,1", "x": 1, "y": 3.25}, - { "label": "3,2", "x": 2, "y": 3.25}, - { "label": "3,3", "x": 3, "y": 3.25}, - { "label": "3,4", "x": 4, "y": 2.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2}, - { "label": "4,0", "x": 0, "y": 4.25}, - { "label": "4,1", "x": 1, "y": 4.25}, - { "label": "4,2", "x": 2, "y": 4.25}, - { "label": "4,3", "x": 3, "y": 4.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, - { "label": "5,0", "x": 0, "y": 5.25}, - { "label": "5,1", "x": 1, "y": 5.25, "w": 2}, - { "label": "5,2", "x": 3, "y": 5.25}, - { "label": "5,3", "x": 4, "y": 4.25, "h": 2} + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5.25}, + {"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/idobao/montex/v1/v1.h b/keyboards/idobao/montex/v1/v1.h deleted file mode 100644 index d57097fa88..0000000000 --- a/keyboards/idobao/montex/v1/v1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* 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 <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K34 }, \ - { K30, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, KC_NO }, \ - { K50, K51, K52, K53, KC_NO } \ -} -- cgit v1.2.3