sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layouts containing keys with multiple matrix positions (#20191)

Browse Source
This commit is contained in:
Ryan
2023-03-29 15:47:59 +11:00
committed by GitHub
parent dc2a625a34
commit 06664e8a94
43 changed files with 2144 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
keyboards/converter/a1200/a1200.h
View File

@@ -1,47 +0,0 @@
/* Copyright 2021 8bits4ever
*
* 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
#define _x_ KC_NO
#include "quantum.h"
/* This a shortcut to help you visually see your layout.
* The first section contains "names" for physical keys of the keyboard
* and defines their position on the board.
* The second section defines position of the keys on the switch matrix
* (where COLUMNS and ROWS crosses). */
#define LAYOUT( \
K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, \
\
K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \
K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3R, K3S, K3T, K3U, \
K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, K2R, K2S, K2T, \
K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K0F, K0G, K0H, K1O, K1P, K1Q, K1R, \
K0A, K0B, K0C, K0D, K0E, K0I, K0J \
) \
{ \
/* "Q" */ { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K2O, K0F, K1A }, \
/* "A" */ { K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K4P, K0H, K0B }, \
/* "Z" */ { K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K4O, K0C, K4O, K0G, K0A }, \
/* PAD */ { K4U, K2T, K3T, K2S, K1Q, K0J, K3S, K2R, K1P, K1R, K3R, K2Q, K1O, K0I, K3U, K1A }, \
/* "1" */ { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K2P, K2A }, \
/* 05 */ { _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, K1M }, \
/* FN */ { K5A, K4R, K5B, K5C, K5D, K5E, K5F, K4S, K5G, K4T, K5H, K5I, K5J, K5K, K4Q, K0D }, \
/* 07 */ { _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, K0E }, \
}
/* A(15) B(16) C(17) D(18) E(19) F(20) G(21) H(22) I(23) J(24) K(25) L(26) M(27) N(28) O(29) P(30) */

213
keyboards/converter/a1200/info.json
View File

@@ -3,107 +3,118 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"F1", "x":2, "y":0},
{"label":"F2", "x":3, "y":0},
{"label":"F3", "x":4, "y":0},
{"label":"F4", "x":5, "y":0},
{"label":"F5", "x":6, "y":0},
{"label":"F6", "x":8, "y":0},
{"label":"F7", "x":9, "y":0},
{"label":"F8", "x":10, "y":0},
{"label":"F9", "x":11, "y":0},
{"label":"F10", "x":12, "y":0},
{"label":"~", "x":0, "y":1.5},
{"label":"!", "x":1, "y":1.5},
{"label":"@", "x":2, "y":1.5},
{"label":"#", "x":3, "y":1.5},
{"label":"$", "x":4, "y":1.5},
{"label":"%", "x":5, "y":1.5},
{"label":"^", "x":6, "y":1.5},
{"label":"&", "x":7, "y":1.5},
{"label":"*", "x":8, "y":1.5},
{"label":"(", "x":9, "y":1.5},
{"label":")", "x":10, "y":1.5},
{"label":"_", "x":11, "y":1.5},
{"label":"+", "x":12, "y":1.5},
{"label":"`", "x":13, "y":1.5},
{"label":"Backspace", "x":14, "y":1.5},
{"label":"Del", "x":15.25, "y":1.5, "w":1.5},
{"label":"Help", "x":16.75, "y":1.5, "w":1.5},
{"label":"Num Lock", "x":18.5, "y":1.5},
{"label":"/", "x":19.5, "y":1.5},
{"label":"*", "x":20.5, "y":1.5},
{"label":"-", "x":21.5, "y":1.5},
{"label":"Tab", "x":0, "y":2.5, "w":1.5},
{"label":"Q", "x":1.5, "y":2.5},
{"label":"W", "x":2.5, "y":2.5},
{"label":"E", "x":3.5, "y":2.5},
{"label":"R", "x":4.5, "y":2.5},
{"label":"T", "x":5.5, "y":2.5},
{"label":"Y", "x":6.5, "y":2.5},
{"label":"U", "x":7.5, "y":2.5},
{"label":"I", "x":8.5, "y":2.5},
{"label":"O", "x":9.5, "y":2.5},
{"label":"P", "x":10.5, "y":2.5},
{"label":"{", "x":11.5, "y":2.5},
{"label":"}", "x":12.5, "y":2.5},
{"label":"7", "x":18.5, "y":2.5},
{"label":"8", "x":19.5, "y":2.5},
{"label":"9", "x":20.5, "y":2.5},
{"label":"+", "x":21.5, "y":2.5},
{"label":"CTRL", "x":0, "y":3.5},
{"label":"Caps Lock", "x":1, "y":3.5},
{"label":"A", "x":2, "y":3.5},
{"label":"S", "x":3, "y":3.5},
{"label":"D", "x":4, "y":3.5},
{"label":"F", "x":5, "y":3.5},
{"label":"G", "x":6, "y":3.5},
{"label":"H", "x":7, "y":3.5},
{"label":"J", "x":8, "y":3.5},
{"label":"K", "x":9, "y":3.5},
{"label":"L", "x":10, "y":3.5},
{"label":":", "x":11, "y":3.5},
{"label":"\"", "x":12, "y":3.5},
{"label":"~", "x":13, "y":3.5},
{"label":"Enter", "x":14, "y":2.5, "h":2},
{"label":"\u2191", "x":16.25, "y":3.5},
{"label":"4", "x":18.5, "y":3.5},
{"label":"5", "x":19.5, "y":3.5},
{"label":"6", "x":20.5, "y":3.5},
{"label":"+", "x":21.5, "y":3.5},
{"label":"Shift", "x":0, "y":4.5, "w":1.25},
{"label":"|", "x":1.25, "y":4.5},
{"label":"Z", "x":2.25, "y":4.5},
{"label":"X", "x":3.25, "y":4.5},
{"label":"C", "x":4.25, "y":4.5},
{"label":"V", "x":5.25, "y":4.5},
{"label":"B", "x":6.25, "y":4.5},
{"label":"N", "x":7.25, "y":4.5},
{"label":"M", "x":8.25, "y":4.5},
{"label":"<", "x":9.25, "y":4.5},
{"label":">", "x":10.25, "y":4.5},
{"label":"?", "x":11.25, "y":4.5},
{"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
{"label":"\u2190", "x":15.25, "y":4.5},
{"label":"\u2193", "x":16.25, "y":4.5},
{"label":"\u2192", "x":17.25, "y":4.5},
{"label":"1", "x":18.5, "y":4.5},
{"label":"2", "x":19.5, "y":4.5},
{"label":"3", "x":20.5, "y":4.5},
{"label":"Enter", "x":21.5, "y":4.5, "h":2},
{"label":"Alt", "x":1, "y":5.5, "w":1.5},
{"label":"Amiga", "x":2.5, "y":5.5, "w":1.5},
{"label":"Space", "x":4, "y":5.5, "w":7},
{"label":"Amiga", "x":11, "y":5.5, "w":1.5},
{"label":"Alt", "x":12.5, "y":5.5, "w":1.5},
{"label":"0", "x":18.5, "y":5.5, "w":2},
{"label":".", "x":20.5, "y":5.5}]
{"matrix": [6, 0], "x": 0, "y": 0},
{"matrix": [6, 2], "x": 2, "y": 0},
{"matrix": [6, 3], "x": 3, "y": 0},
{"matrix": [6, 4], "x": 4, "y": 0},
{"matrix": [6, 5], "x": 5, "y": 0},
{"matrix": [6, 6], "x": 6, "y": 0},
{"matrix": [6, 8], "x": 8, "y": 0},
{"matrix": [6, 10], "x": 9, "y": 0},
{"matrix": [6, 11], "x": 10, "y": 0},
{"matrix": [6, 12], "x": 11, "y": 0},
{"matrix": [6, 13], "x": 12, "y": 0},
{"matrix": [4, 0], "x": 0, "y": 1.5},
{"matrix": [4, 1], "x": 1, "y": 1.5},
{"matrix": [4, 2], "x": 2, "y": 1.5},
{"matrix": [4, 3], "x": 3, "y": 1.5},
{"matrix": [4, 4], "x": 4, "y": 1.5},
{"matrix": [4, 5], "x": 5, "y": 1.5},
{"matrix": [4, 6], "x": 6, "y": 1.5},
{"matrix": [4, 7], "x": 7, "y": 1.5},
{"matrix": [4, 8], "x": 8, "y": 1.5},
{"matrix": [4, 9], "x": 9, "y": 1.5},
{"matrix": [4, 10], "x": 10, "y": 1.5},
{"matrix": [4, 11], "x": 11, "y": 1.5},
{"matrix": [4, 12], "x": 12, "y": 1.5},
{"matrix": [4, 13], "x": 13, "y": 1.5},
{"matrix": [2, 11], "x": 14, "y": 1.5},
{"matrix": [1, 13], "x": 15.25, "y": 1.5, "w": 1.5},
{"matrix": [6, 14], "x": 16.75, "y": 1.5, "w": 1.5},
{"matrix": [6, 1], "x": 18.5, "y": 1.5},
{"matrix": [6, 7], "x": 19.5, "y": 1.5},
{"matrix": [6, 9], "x": 20.5, "y": 1.5},
{"matrix": [3, 0], "x": 21.5, "y": 1.5},
{"matrix": [0, 0], "x": 0, "y": 2.5, "w": 1.5},
{"matrix": [0, 1], "x": 1.5, "y": 2.5},
{"matrix": [0, 2], "x": 2.5, "y": 2.5},
{"matrix": [0, 3], "x": 3.5, "y": 2.5},
{"matrix": [0, 4], "x": 4.5, "y": 2.5},
{"matrix": [0, 5], "x": 5.5, "y": 2.5},
{"matrix": [0, 6], "x": 6.5, "y": 2.5},
{"matrix": [0, 7], "x": 7.5, "y": 2.5},
{"matrix": [0, 8], "x": 8.5, "y": 2.5},
{"matrix": [0, 9], "x": 9.5, "y": 2.5},
{"matrix": [0, 10], "x": 10.5, "y": 2.5},
{"matrix": [0, 11], "x": 11.5, "y": 2.5},
{"matrix": [0, 12], "x": 12.5, "y": 2.5},
{"matrix": [3, 10], "x": 18.5, "y": 2.5},
{"matrix": [3, 6], "x": 19.5, "y": 2.5},
{"matrix": [3, 2], "x": 20.5, "y": 2.5},
{"matrix": [3, 14], "x": 21.5, "y": 2.5},
{"matrix": [4, 15], "x": 0, "y": 3.5},
{"matrix": [1, 0], "x": 1, "y": 3.5},
{"matrix": [1, 1], "x": 2, "y": 3.5},
{"matrix": [1, 2], "x": 3, "y": 3.5},
{"matrix": [1, 3], "x": 4, "y": 3.5},
{"matrix": [1, 4], "x": 5, "y": 3.5},
{"matrix": [1, 5], "x": 6, "y": 3.5},
{"matrix": [1, 6], "x": 7, "y": 3.5},
{"matrix": [1, 7], "x": 8, "y": 3.5},
{"matrix": [1, 8], "x": 9, "y": 3.5},
{"matrix": [1, 9], "x": 10, "y": 3.5},
{"matrix": [1, 10], "x": 11, "y": 3.5},
{"matrix": [1, 11], "x": 12, "y": 3.5},
{"matrix": [1, 12], "x": 13, "y": 3.5},
{"matrix": [0, 13], "x": 14, "y": 2.5, "h": 2},
{"matrix": [4, 14], "x": 16.25, "y": 3.5},
{"matrix": [3, 11], "x": 18.5, "y": 3.5},
{"matrix": [3, 7], "x": 19.5, "y": 3.5},
{"matrix": [3, 3], "x": 20.5, "y": 3.5},
{"matrix": [3, 1], "x": 21.5, "y": 3.5},
{"matrix": [3, 15], "x": 0, "y": 4.5, "w": 1.25},
{"matrix": [2, 0], "x": 1.25, "y": 4.5},
{"matrix": [2, 1], "x": 2.25, "y": 4.5},
{"matrix": [2, 2], "x": 3.25, "y": 4.5},
{"matrix": [2, 3], "x": 4.25, "y": 4.5},
{"matrix": [2, 4], "x": 5.25, "y": 4.5},
{"matrix": [2, 5], "x": 6.25, "y": 4.5},
{"matrix": [2, 6], "x": 7.25, "y": 4.5},
{"matrix": [2, 7], "x": 8.25, "y": 4.5},
{"matrix": [2, 8], "x": 9.25, "y": 4.5},
{"matrix": [2, 9], "x": 10.25, "y": 4.5},
{"matrix": [2, 10], "x": 11.25, "y": 4.5},
{"matrix": [5, 15], "x": 12.25, "y": 4.5, "w": 2.75},
{"matrix": [0, 14], "x": 15.25, "y": 4.5},
{"matrix": [2, 14], "x": 16.25, "y": 4.5},
{"matrix": [1, 14], "x": 17.25, "y": 4.5},
{"matrix": [3, 12], "x": 18.5, "y": 4.5},
{"matrix": [3, 8], "x": 19.5, "y": 4.5},
{"matrix": [3, 4], "x": 20.5, "y": 4.5},
{"matrix": [3, 9], "x": 21.5, "y": 4.5, "h": 2},
{"matrix": [2, 15], "x": 1, "y": 5.5, "w": 1.5},
{"matrix": [1, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"matrix": [2, 12], "x": 4, "y": 5.5, "w": 7},
{"matrix": [6, 15], "x": 11, "y": 5.5, "w": 1.5},
{"matrix": [7, 15], "x": 12.5, "y": 5.5, "w": 1.5},
{"matrix": [3, 13], "x": 18.5, "y": 5.5, "w": 2},
{"matrix": [3, 5], "x": 20.5, "y": 5.5}
]
}
}
}

2
keyboards/converter/hp_46010a/hp_46010a.h
View File

@@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{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_PLUS, KEY_P3, KEY_MINU, KEY_PTAB }, \
{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 }, \
}