From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/converter/numeric_keypad_iie/info.json | 38 +++++++++++++++++++++- .../numeric_keypad_iie/numeric_keypad_iie.h | 30 ----------------- 2 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h (limited to 'keyboards/converter') diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index ae160c7038..a6a81507ec 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -17,7 +17,43 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}] + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0}, + + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [3, 2], "x": 3, "y": 0}, + {"matrix": [3, 3], "x": 4, "y": 0}, + + {"matrix": [2, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 0], "x": 6.5, "y": 0}, + + {"matrix": [1, 1], "x": 0, "y": 1}, + + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [1, 0], "x": 6.5, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 2}, + + {"matrix": [1, 3], "x": 2, "y": 2}, + {"matrix": [1, 4], "x": 3, "y": 2}, + {"matrix": [1, 5], "x": 4, "y": 2}, + + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 0], "x": 6.5, "y": 2}, + + {"matrix": [2, 1], "x": 0, "y": 3}, + + {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5}, + {"matrix": [2, 5], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [2, 4], "x": 5.5, "y": 3}, + {"matrix": [2, 0], "x": 6.5, "y": 3} + ] } } } diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h deleted file mode 100644 index 8892b5553b..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright Adam Newbold - * - * 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( \ - K_ESC, K_7, K_8, K_9, K_LEFT_PARENS, K_RIGHT_PARENS, \ - K_LEFT, K_4, K_5, K_6, K_MINUS, K_DIVIDE, \ - K_RIGHT, K_1, K_2, K_3, K_PLUS, K_MULTIPLY, \ - K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN, K_PRINT \ -){ \ - { K_RIGHT_PARENS, K_ESC, K_4, K_5, K_6, K_7 },\ - { K_DIVIDE, K_LEFT, K_0, K_1, K_2, K_3 },\ - { K_PRINT, K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\ - { K_MULTIPLY, K_RIGHT, K_8, K_9, K_DOT, K_PLUS },\ -} -- cgit v1.2.3