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/converter/hp_46010a/hp_46010a.h | 60 -------- keyboards/converter/hp_46010a/info.json | 232 ++++++++++++++++-------------- 2 files changed, 125 insertions(+), 167 deletions(-) delete mode 100644 keyboards/converter/hp_46010a/hp_46010a.h (limited to 'keyboards/converter/hp_46010a') diff --git a/keyboards/converter/hp_46010a/hp_46010a.h b/keyboards/converter/hp_46010a/hp_46010a.h deleted file mode 100644 index 86fb3806f0..0000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2018 listofoptions - -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" - -/* ,---------. ,---------------------------------------------------------. ,---------. ,-------------------. - * | res|stop| | f1| f2| f3| f4|menu|user| f5| f6| f7| f8| |clrl|clrd| | | | | | - * `---------' `---------------------------------------------------------' `---------' `-------------------' - * ,------------------------------------------------------------------------..---------. ,-------------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| +| back||insl|dell| | *| /| +| -| - * |------------------------------------------------------------------------||---------| |-------------------| - * | tab| q| w| e| r| t| y| u| i| o| p| [| ]| \||insc|delc| | 7| 8| 9|pade| - * |------------------------------------------------------------------------||---------| |-------------------| - * |caps|ctrl| a| s| d| f| g| h| j| k| l| ;| '| retr|| cur|prev| | 4| 5| 6| ,| - * |------------------------------------------------------------------------------------ |-------------------| - * |dele|lshf | z| x| c| v| b| n| m| ,| .| /|rshf |sel | up|next| | 1| 2| 3| tab| - * |-------------------------------------------------------------------------|---------| |--------------- | - * |prnt| |lalt| space |ralt| |left|down|rght| | 0| .| | - * `-----------------------------------------------------------------------------------' `-------------------' - */ - -#define LAYOUT( \ - KEY_RES, KEY_STOP, KEY_F1, KEY_F2, KEY_F3, KEY_F4,KEY_MENU,KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_B1, KEY_B2, KEY_B3, KEY_B4, \ - KEY_GRAV, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_MULT, KEY_DIV, KEY_ADD, KEY_SUBT, \ - KEY_TAB, KEY_Q,KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_P7, KEY_P8, KEY_P9, KEY_PADE, \ - KEY_CAPS, KEY_CTRL, KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_P4, KEY_P5, KEY_P6, KEY_PCOM, \ - KEY_DELE, KEY_LSHF, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMA, KEY_DOT, KEY_SLAS,KEY_RSHF, KEY_SEL, KEY_UP, KEY_NEXT, KEY_P1, KEY_P2, KEY_P3, KEY_PTAB, \ - KEY_PRNT, KEY_LALT, KEY_SPACE , KEY_RALT, KEY_LEFT, KEY_DOWN, KEY_RGHT, KEY_P0, KEY_PDOT \ -) { \ - {KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_MENU }, \ - {KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_8 }, \ - {KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_I }, \ - {KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_J }, \ - {KEY_COMA, KEY_DOT, KEY_SLAS, KEY_1, KEY_SEL, KEY_UP, KEY_NEXT, KEY_M }, \ - {KEY_SPACE, KEY_LALT, KEY_RALT, KC_NO, KEY_LEFT, KEY_DOWN, KEY_RGHT, KC_NO }, \ - {KEY_F3, KEY_F2, KEY_F1, KEY_GRAV, KEY_CTRL, KEY_STOP, KEY_G, KEY_F4 }, \ - {KEY_6, KEY_5, KEY_4, KEY_3, KEY_CAPS, KEY_RSHF, KEY_LSHF, KEY_7 }, \ - {KEY_Y, KEY_T, KEY_R, KEY_E, KEY_W, KEY_Q, KEY_TAB, KEY_U }, \ - {KEY_RES, KEY_F, KEY_D, KEY_S, KEY_A, KC_NO, KEY_2, KEY_H }, \ - {KEY_P7, KEY_P4, KEY_P8, KEY_P5, KEY_P9, KEY_P6, KEY_PADE, KEY_PCOM }, \ - {KEY_MULT, KEY_P1, KEY_DIV, KEY_P2, KEY_ADD, KEY_P3, KEY_SUBT, KEY_PTAB }, \ - {KEY_B1, KEY_P0, KEY_B2, KC_NO, KEY_B3, KEY_PDOT, KEY_B4, KC_NO }, \ - {KEY_B, KEY_V, KEY_C, KEY_X, KEY_Z, KEY_PRNT, KEY_DELE, KEY_N }, \ -} diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index 8492d5f200..da29c72fac 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -13,113 +13,131 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Reset", "x":0, "y":0}, - {"label":"Stop", "x":1, "y":0}, - {"label":"F1", "x":2.5, "y":0, "w":1.25}, - {"label":"F2", "x":3.75, "y":0, "w":1.25}, - {"label":"F3", "x":5, "y":0, "w":1.25}, - {"label":"F4", "x":6.25, "y":0, "w":1.25}, - {"label":"Menu", "x":7.5, "y":0}, - {"label":"User", "x":8.5, "y":0}, - {"label":"F5", "x":9.5, "y":0, "w":1.25}, - {"label":"F6", "x":10.75, "y":0, "w":1.25}, - {"label":"F7", "x":12, "y":0, "w":1.25}, - {"label":"F8", "x":13.25, "y":0, "w":1.25}, - {"label":"Clear line", "x":15, "y":0}, - {"label":"Clear display", "x":16, "y":0}, - {"x":18, "y":0}, - {"x":19, "y":0}, - {"x":20, "y":0}, - {"x":21, "y":0}, - {"label":"`", "x":0, "y":2, "w":1.25}, - {"label":"1", "x":1.25, "y":2}, - {"label":"2", "x":2.25, "y":2}, - {"label":"3", "x":3.25, "y":2}, - {"label":"4", "x":4.25, "y":2}, - {"label":"5", "x":5.25, "y":2}, - {"label":"6", "x":6.25, "y":2}, - {"label":"7", "x":7.25, "y":2}, - {"label":"8", "x":8.25, "y":2}, - {"label":"9", "x":9.25, "y":2}, - {"label":"0", "x":10.25, "y":2}, - {"label":"-", "x":11.25, "y":2}, - {"label":"=", "x":12.25, "y":2}, - {"label":"Backspace", "x":13.25, "y":2, "w":1.5}, - {"label":"Insert line", "x":15, "y":2}, - {"label":"Delete line", "x":16, "y":2}, - {"label":"*", "x":18, "y":2}, - {"label":"/", "x":19, "y":2}, - {"label":"+", "x":20, "y":2}, - {"label":"-", "x":21, "y":2}, - {"label":"Tab", "x":0, "y":3, "w":1.75}, - {"label":"Q", "x":1.75, "y":3}, - {"label":"W", "x":2.75, "y":3}, - {"label":"E", "x":3.75, "y":3}, - {"label":"R", "x":4.75, "y":3}, - {"label":"T", "x":5.75, "y":3}, - {"label":"Y", "x":6.75, "y":3}, - {"label":"U", "x":7.75, "y":3}, - {"label":"I", "x":8.75, "y":3}, - {"label":"O", "x":9.75, "y":3}, - {"label":"P", "x":10.75, "y":3}, - {"label":"[", "x":11.75, "y":3}, - {"label":"]", "x":12.75, "y":3}, - {"label":"\\", "x":13.75, "y":3}, - {"label":"Insert char", "x":15, "y":3}, - {"label":"Delete char", "x":16, "y":3}, - {"label":"7", "x":18, "y":3}, - {"label":"8", "x":19, "y":3}, - {"label":"9", "x":20, "y":3}, - {"label":"Enter", "x":21, "y":3}, - {"label":"Caps Lock", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"A", "x":2, "y":4}, - {"label":"S", "x":3, "y":4}, - {"label":"D", "x":4, "y":4}, - {"label":"F", "x":5, "y":4}, - {"label":"G", "x":6, "y":4}, - {"label":"H", "x":7, "y":4}, - {"label":"J", "x":8, "y":4}, - {"label":"K", "x":9, "y":4}, - {"label":"L", "x":10, "y":4}, - {"label":";", "x":11, "y":4}, - {"label":"'", "x":12, "y":4}, - {"label":"Return", "x":13, "y":4, "w":1.75}, - {"label":"Cursor", "x":15, "y":4}, - {"label":"Prev", "x":16, "y":4}, - {"label":"4", "x":18, "y":4}, - {"label":"5", "x":19, "y":4}, - {"label":"6", "x":20, "y":4}, - {"label":",", "x":21, "y":4}, - {"label":"Del", "x":0, "y":5}, - {"label":"Shift", "x":1.25, "y":5, "w":1.25}, - {"label":"Z", "x":2.5, "y":5}, - {"label":"X", "x":3.5, "y":5}, - {"label":"C", "x":4.5, "y":5}, - {"label":"V", "x":5.5, "y":5}, - {"label":"B", "x":6.5, "y":5}, - {"label":"N", "x":7.5, "y":5}, - {"label":"M", "x":8.5, "y":5}, - {"label":",", "x":9.5, "y":5}, - {"label":".", "x":10.5, "y":5}, - {"label":"/", "x":11.5, "y":5}, - {"label":"Shift", "x":12.5, "y":5, "w":1.25}, - {"label":"Select", "x":14, "y":5}, - {"label":"Up", "x":15, "y":5}, - {"label":"Next", "x":16, "y":5}, - {"label":"1", "x":18, "y":5}, - {"label":"2", "x":19, "y":5}, - {"label":"3", "x":20, "y":5}, - {"label":"Tab", "x":21, "y":5, "h":2}, - {"label":"Win", "x":0, "y":6}, - {"label":"Extend Char", "x":2.5, "y":6}, - {"x":3.5, "y":6, "w":8}, - {"label":"Extend Char", "x":11.5, "y":6}, - {"label":"Left", "x":14, "y":6}, - {"label":"Down", "x":15, "y":6}, - {"label":"Right", "x":16, "y":6}, - {"label":"0", "x":18, "y":6, "w":2}, - {"label":".", "x":20, "y":6} + {"matrix": [9, 0], "x": 0, "y": 0}, + {"matrix": [6, 5], "x": 1, "y": 0}, + + {"matrix": [6, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [6, 0], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [6, 7], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 0], "x": 8.5, "y": 0}, + {"matrix": [0, 1], "x": 9.5, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 10.75, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 12, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 13.25, "y": 0, "w": 1.25}, + + {"matrix": [0, 5], "x": 15, "y": 0}, + {"matrix": [0, 6], "x": 16, "y": 0}, + + {"matrix": [12, 0], "x": 18, "y": 0}, + {"matrix": [12, 2], "x": 19, "y": 0}, + {"matrix": [12, 4], "x": 20, "y": 0}, + {"matrix": [12, 6], "x": 21, "y": 0}, + + {"matrix": [6, 3], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 2}, + {"matrix": [9, 6], "x": 2.25, "y": 2}, + {"matrix": [7, 3], "x": 3.25, "y": 2}, + {"matrix": [7, 2], "x": 4.25, "y": 2}, + {"matrix": [7, 1], "x": 5.25, "y": 2}, + {"matrix": [7, 0], "x": 6.25, "y": 2}, + {"matrix": [7, 7], "x": 7.25, "y": 2}, + {"matrix": [1, 7], "x": 8.25, "y": 2}, + {"matrix": [1, 0], "x": 9.25, "y": 2}, + {"matrix": [1, 1], "x": 10.25, "y": 2}, + {"matrix": [1, 2], "x": 11.25, "y": 2}, + {"matrix": [1, 3], "x": 12.25, "y": 2}, + {"matrix": [1, 4], "x": 13.25, "y": 2, "w": 1.5}, + + {"matrix": [1, 5], "x": 15, "y": 2}, + {"matrix": [1, 6], "x": 16, "y": 2}, + + {"matrix": [11, 0], "x": 18, "y": 2}, + {"matrix": [11, 2], "x": 19, "y": 2}, + {"matrix": [11, 4], "x": 20, "y": 2}, + {"matrix": [11, 6], "x": 21, "y": 2}, + + {"matrix": [8, 6], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [8, 5], "x": 1.75, "y": 3}, + {"matrix": [8, 4], "x": 2.75, "y": 3}, + {"matrix": [8, 3], "x": 3.75, "y": 3}, + {"matrix": [8, 2], "x": 4.75, "y": 3}, + {"matrix": [8, 1], "x": 5.75, "y": 3}, + {"matrix": [8, 0], "x": 6.75, "y": 3}, + {"matrix": [8, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 7], "x": 8.75, "y": 3}, + {"matrix": [2, 0], "x": 9.75, "y": 3}, + {"matrix": [2, 1], "x": 10.75, "y": 3}, + {"matrix": [2, 2], "x": 11.75, "y": 3}, + {"matrix": [2, 3], "x": 12.75, "y": 3}, + {"matrix": [2, 4], "x": 13.75, "y": 3}, + + {"matrix": [2, 5], "x": 15, "y": 3}, + {"matrix": [2, 6], "x": 16, "y": 3}, + + {"matrix": [10, 0], "x": 18, "y": 3}, + {"matrix": [10, 2], "x": 19, "y": 3}, + {"matrix": [10, 4], "x": 20, "y": 3}, + {"matrix": [10, 6], "x": 21, "y": 3}, + + {"matrix": [7, 4], "x": 0, "y": 4}, + {"matrix": [6, 4], "x": 1, "y": 4}, + {"matrix": [9, 4], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 2], "x": 4, "y": 4}, + {"matrix": [9, 1], "x": 5, "y": 4}, + {"matrix": [6, 6], "x": 6, "y": 4}, + {"matrix": [9, 7], "x": 7, "y": 4}, + {"matrix": [3, 7], "x": 8, "y": 4}, + {"matrix": [3, 0], "x": 9, "y": 4}, + {"matrix": [3, 1], "x": 10, "y": 4}, + {"matrix": [3, 2], "x": 11, "y": 4}, + {"matrix": [3, 3], "x": 12, "y": 4}, + {"matrix": [3, 4], "x": 13, "y": 4, "w": 1.75}, + + {"matrix": [3, 5], "x": 15, "y": 4}, + {"matrix": [3, 6], "x": 16, "y": 4}, + + {"matrix": [10, 1], "x": 18, "y": 4}, + {"matrix": [10, 3], "x": 19, "y": 4}, + {"matrix": [10, 5], "x": 20, "y": 4}, + {"matrix": [10, 7], "x": 21, "y": 4}, + + {"matrix": [13, 6], "x": 0, "y": 5}, + {"matrix": [7, 6], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [13, 4], "x": 2.5, "y": 5}, + {"matrix": [13, 3], "x": 3.5, "y": 5}, + {"matrix": [13, 2], "x": 4.5, "y": 5}, + {"matrix": [13, 1], "x": 5.5, "y": 5}, + {"matrix": [13, 0], "x": 6.5, "y": 5}, + {"matrix": [13, 7], "x": 7.5, "y": 5}, + {"matrix": [4, 7], "x": 8.5, "y": 5}, + {"matrix": [4, 0], "x": 9.5, "y": 5}, + {"matrix": [4, 1], "x": 10.5, "y": 5}, + {"matrix": [4, 2], "x": 11.5, "y": 5}, + {"matrix": [7, 5], "x": 12.5, "y": 5, "w": 1.25}, + + {"matrix": [4, 4], "x": 14, "y": 5}, + {"matrix": [4, 5], "x": 15, "y": 5}, + {"matrix": [4, 6], "x": 16, "y": 5}, + + {"matrix": [11, 1], "x": 18, "y": 5}, + {"matrix": [11, 3], "x": 19, "y": 5}, + {"matrix": [11, 5], "x": 20, "y": 5}, + {"matrix": [11, 7], "x": 21, "y": 5, "h": 2}, + + {"matrix": [13, 5], "x": 0, "y": 6}, + {"matrix": [5, 1], "x": 2.5, "y": 6}, + {"matrix": [5, 0], "x": 3.5, "y": 6, "w": 8}, + {"matrix": [5, 2], "x": 11.5, "y": 6}, + + {"matrix": [5, 4], "x": 14, "y": 6}, + {"matrix": [5, 5], "x": 15, "y": 6}, + {"matrix": [5, 6], "x": 16, "y": 6}, + + {"matrix": [12, 1], "x": 18, "y": 6, "w": 2}, + {"matrix": [12, 5], "x": 20, "y": 6} ] } } -- cgit v1.2.3