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

Move remaining LAYOUTs to data driven (#20422)

Browse Source
This commit is contained in:
Ryan
2023-04-15 21:07:32 +10:00
committed by GitHub
parent 54634e9263
commit a84528f853
181 changed files with 17568 additions and 14711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

317
keyboards/salicylic_acid3/naked64/rev1/info.json
View File

@@ -30,170 +30,189 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"pgup", "x":0.25, "y":0},
{"label":"ESC", "x":1.75, "y":0},
{"label":"1", "x":2.75, "y":0},
{"label":"2", "x":4, "y":0},
{"label":"3", "x":5, "y":0},
{"label":"4", "x":6, "y":0},
{"label":"5", "x":7, "y":0},
{"label":"6", "x":9.25, "y":0},
{"label":"7", "x":10.25, "y":0},
{"label":"8", "x":11.25, "y":0},
{"label":"9", "x":12.25, "y":0},
{"label":"0", "x":13.5, "y":0},
{"label":"-", "x":14.5, "y":0},
{"label":"Back Space", "x":15.5, "y":0},
{"label":"pgdn", "x":0, "y":1},
{"label":"Tab", "x":1.25, "y":1, "w":1.5},
{"label":"Q", "x":2.75, "y":1},
{"label":"W", "x":4, "y":1},
{"label":"E", "x":5, "y":1},
{"label":"R", "x":6, "y":1},
{"label":"T", "x":7, "y":1},
{"label":"Y", "x":9.25, "y":1},
{"label":"U", "x":10.25, "y":1},
{"label":"I", "x":11.25, "y":1},
{"label":"O", "x":12.25, "y":1},
{"label":"P", "x":13.5, "y":1},
{"label":"[", "x":14.5, "y":1},
{"label":"]", "x":15.5, "y":1},
{"label":"Control", "x":1, "y":2, "w":1.75},
{"label":"A", "x":2.75, "y":2},
{"label":"S", "x":4, "y":2},
{"label":"D", "x":5, "y":2},
{"label":"F", "x":6, "y":2},
{"label":"G", "x":7, "y":2},
{"label":"H", "x":9.25, "y":2},
{"label":"J", "x":10.25, "y":2},
{"label":"K", "x":11.25, "y":2},
{"label":"L", "x":12.25, "y":2},
{"label":";", "x":13.5, "y":2},
{"label":"'", "x":14.5, "y":2},
{"label":"Return", "x":15.5, "y":2},
{"label":"Shift", "x":0.5, "y":3, "w":2.25},
{"label":"Z", "x":2.75, "y":3},
{"label":"X", "x":4, "y":3},
{"label":"C", "x":5, "y":3},
{"label":"V", "x":6, "y":3},
{"label":"B", "x":7, "y":3},
{"label":"N", "x":9.25, "y":3},
{"label":"M", "x":10.25, "y":3},
{"label":",", "x":11.25, "y":3},
{"label":".", "x":12.25, "y":3},
{"label":"/", "x":13.5, "y":3},
{"label":"↑", "x":14.5, "y":3},
{"label":"Shift", "x":15.5, "y":3},
{"label":"Adjust", "x":1.25, "y":4, "w":1.75},
{"label":"Alt", "x":3.75, "y":4.25},
{"x":4.75, "y":4.25, "w":2.25},
{"label":"⇓", "x":7, "y":4.25},
{"label":"⇑", "x":9.25, "y":4.25},
{"x":10.25, "y":4.25, "w":2},
{"label":"GUI", "x":12.25, "y":4.25},
{"label":"←", "x":13.5, "y":4},
{"label":"↓", "x":14.5, "y":4},
{"label":"→", "x":15.5, "y":4}
{"matrix": [0, 0], "x": 0.25, "y": 0},
{"matrix": [2, 0], "x": 1.75, "y": 0},
{"matrix": [7, 0], "x": 2.75, "y": 0},
{"matrix": [3, 1], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},
{"matrix": [5, 2], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"matrix": [6, 3], "x": 9.25, "y": 0},
{"matrix": [3, 4], "x": 10.25, "y": 0},
{"matrix": [0, 5], "x": 11.25, "y": 0},
{"matrix": [4, 5], "x": 12.25, "y": 0},
{"matrix": [1, 6], "x": 13.5, "y": 0},
{"matrix": [6, 6], "x": 14.5, "y": 0},
{"matrix": [3, 7], "x": 15.5, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [0, 1], "x": 2.75, "y": 1},
{"matrix": [4, 1], "x": 4, "y": 1},
{"matrix": [1, 2], "x": 5, "y": 1},
{"matrix": [6, 2], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [7, 3], "x": 9.25, "y": 1},
{"matrix": [4, 4], "x": 10.25, "y": 1},
{"matrix": [1, 5], "x": 11.25, "y": 1},
{"matrix": [5, 5], "x": 12.25, "y": 1},
{"matrix": [2, 6], "x": 13.5, "y": 1},
{"matrix": [7, 6], "x": 14.5, "y": 1},
{"matrix": [4, 7], "x": 15.5, "y": 1},
{"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
{"matrix": [1, 1], "x": 2.75, "y": 2},
{"matrix": [5, 1], "x": 4, "y": 2},
{"matrix": [2, 2], "x": 5, "y": 2},
{"matrix": [7, 2], "x": 6, "y": 2},
{"matrix": [3, 3], "x": 7, "y": 2},
{"matrix": [0, 4], "x": 9.25, "y": 2},
{"matrix": [5, 4], "x": 10.25, "y": 2},
{"matrix": [2, 5], "x": 11.25, "y": 2},
{"matrix": [6, 5], "x": 12.25, "y": 2},
{"matrix": [3, 6], "x": 13.5, "y": 2},
{"matrix": [0, 7], "x": 14.5, "y": 2},
{"matrix": [5, 7], "x": 15.5, "y": 2},
{"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
{"matrix": [2, 1], "x": 2.75, "y": 3},
{"matrix": [6, 1], "x": 4, "y": 3},
{"matrix": [3, 2], "x": 5, "y": 3},
{"matrix": [0, 3], "x": 6, "y": 3},
{"matrix": [4, 3], "x": 7, "y": 3},
{"matrix": [1, 4], "x": 9.25, "y": 3},
{"matrix": [6, 4], "x": 10.25, "y": 3},
{"matrix": [3, 5], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3},
{"matrix": [4, 6], "x": 13.5, "y": 3},
{"matrix": [1, 7], "x": 14.5, "y": 3},
{"matrix": [6, 7], "x": 15.5, "y": 3},
{"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
{"matrix": [7, 1], "x": 3.75, "y": 4.25},
{"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
{"matrix": [5, 3], "x": 7, "y": 4.25},
{"matrix": [2, 4], "x": 9.25, "y": 4.25},
{"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
{"matrix": [0, 6], "x": 12.25, "y": 4.25},
{"matrix": [5, 6], "x": 13.5, "y": 4},
{"matrix": [2, 7], "x": 14.5, "y": 4},
{"matrix": [7, 7], "x": 15.5, "y": 4}
]
},
"LAYOUT_with_setta21": {
"layout": [
{"label":"pgup", "x":0.25, "y":0},
{"label":"ESC", "x":1.75, "y":0},
{"label":"1", "x":2.75, "y":0},
{"label":"2", "x":4, "y":0},
{"label":"3", "x":5, "y":0},
{"label":"4", "x":6, "y":0},
{"label":"5", "x":7, "y":0},
{"label":"6", "x":9.25, "y":0},
{"label":"7", "x":10.25, "y":0},
{"label":"8", "x":11.25, "y":0},
{"label":"9", "x":12.25, "y":0},
{"label":"0", "x":13.5, "y":0},
{"label":"-", "x":14.5, "y":0},
{"label":"Back Space", "x":15.5, "y":0},
{"matrix": [0, 0], "x": 0.25, "y": 0},
{"label":"Esc", "x": 17.5, "y":0},
{"label":"F2", "x": 18.5, "y":0},
{"label":"=", "x": 19.5, "y":0},
{"label":"Delete", "x": 20.5, "y":0},
{"matrix": [2, 0], "x": 1.75, "y": 0},
{"matrix": [7, 0], "x": 2.75, "y": 0},
{"matrix": [3, 1], "x": 4, "y": 0},
{"matrix": [0, 2], "x": 5, "y": 0},
{"matrix": [5, 2], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"label":"pgdn", "x":0, "y":1},
{"label":"Tab", "x":1.25, "y":1, "w":1.5},
{"label":"Q", "x":2.75, "y":1},
{"label":"W", "x":4, "y":1},
{"label":"E", "x":5, "y":1},
{"label":"R", "x":6, "y":1},
{"label":"T", "x":7, "y":1},
{"label":"Y", "x":9.25, "y":1},
{"label":"U", "x":10.25, "y":1},
{"label":"I", "x":11.25, "y":1},
{"label":"O", "x":12.25, "y":1},
{"label":"P", "x":13.5, "y":1},
{"label":"[", "x":14.5, "y":1},
{"label":"]", "x":15.5, "y":1},
{"matrix": [6, 3], "x": 9.25, "y": 0},
{"matrix": [3, 4], "x": 10.25, "y": 0},
{"matrix": [0, 5], "x": 11.25, "y": 0},
{"matrix": [4, 5], "x": 12.25, "y": 0},
{"matrix": [1, 6], "x": 13.5, "y": 0},
{"matrix": [6, 6], "x": 14.5, "y": 0},
{"matrix": [3, 7], "x": 15.5, "y": 0},
{"label":"Num Lock", "x": 17.5, "y":1.25},
{"label":"/", "x": 18.5, "y":1.25},
{"label":"*", "x": 19.5, "y":1.25},
{"label":"-", "x": 20.5, "y":1.25},
{"matrix": [8, 5], "x": 17.5, "y": 0},
{"matrix": [9, 5], "x": 18.5, "y": 0},
{"matrix": [10, 5], "x": 19.5, "y": 0},
{"matrix": [11, 5], "x": 20.5, "y": 0},
{"label":"Control", "x":1, "y":2, "w":1.75},
{"label":"A", "x":2.75, "y":2},
{"label":"S", "x":4, "y":2},
{"label":"D", "x":5, "y":2},
{"label":"F", "x":6, "y":2},
{"label":"G", "x":7, "y":2},
{"label":"H", "x":9.25, "y":2},
{"label":"J", "x":10.25, "y":2},
{"label":"K", "x":11.25, "y":2},
{"label":"L", "x":12.25, "y":2},
{"label":";", "x":13.5, "y":2},
{"label":"'", "x":14.5, "y":2},
{"label":"Return", "x":15.5, "y":2},
{"matrix": [1, 0], "x": 0, "y": 1},
{"label":"7", "x": 17.5, "y":2.25},
{"label":"8", "x": 18.5, "y":2.25},
{"label":"9", "x": 19.5, "y":2.25},
{"matrix": [3, 0], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [0, 1], "x": 2.75, "y": 1},
{"matrix": [4, 1], "x": 4, "y": 1},
{"matrix": [1, 2], "x": 5, "y": 1},
{"matrix": [6, 2], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"label":"Shift", "x":0.5, "y":3, "w":2.25},
{"label":"Z", "x":2.75, "y":3},
{"label":"X", "x":4, "y":3},
{"label":"C", "x":5, "y":3},
{"label":"V", "x":6, "y":3},
{"label":"B", "x":7, "y":3},
{"label":"N", "x":9.25, "y":3},
{"label":"M", "x":10.25, "y":3},
{"label":",", "x":11.25, "y":3},
{"label":".", "x":12.25, "y":3},
{"label":"/", "x":13.5, "y":3},
{"label":"↑", "x":14.5, "y":3},
{"label":"Shift", "x":15.5, "y":3},
{"matrix": [7, 3], "x": 9.25, "y": 1},
{"matrix": [4, 4], "x": 10.25, "y": 1},
{"matrix": [1, 5], "x": 11.25, "y": 1},
{"matrix": [5, 5], "x": 12.25, "y": 1},
{"matrix": [2, 6], "x": 13.5, "y": 1},
{"matrix": [7, 6], "x": 14.5, "y": 1},
{"matrix": [4, 7], "x": 15.5, "y": 1},
{"label":"4", "x": 17.5, "y":3.25},
{"label":"5", "x": 18.5, "y":3.25},
{"label":"6", "x": 19.5, "y":3.25},
{"label":"+", "x": 20.5, "y":2.25, "h":2},
{"matrix": [8, 4], "x": 17.5, "y": 1.25},
{"matrix": [9, 4], "x": 18.5, "y": 1.25},
{"matrix": [10, 4], "x": 19.5, "y": 1.25},
{"matrix": [11, 4], "x": 20.5, "y": 1.25},
{"label":"Adjust", "x":1.25, "y":4, "w":1.75},
{"label":"Alt", "x":3.75, "y":4.25},
{"x":4.75, "y":4.25, "w":2.25},
{"label":"⇓", "x":7, "y":4.25},
{"label":"⇑", "x":9.25, "y":4.25},
{"x":10.25, "y":4.25, "w":2},
{"label":"GUI", "x":12.25, "y":4.25},
{"label":"←", "x":13.5, "y":4},
{"label":"↓", "x":14.5, "y":4},
{"label":"→", "x":15.5, "y":4},
{"matrix": [4, 0], "x": 1, "y": 2, "w": 1.75},
{"matrix": [1, 1], "x": 2.75, "y": 2},
{"matrix": [5, 1], "x": 4, "y": 2},
{"matrix": [2, 2], "x": 5, "y": 2},
{"matrix": [7, 2], "x": 6, "y": 2},
{"matrix": [3, 3], "x": 7, "y": 2},
{"label":"1", "x": 17.5, "y":4.25},
{"label":"2", "x": 18.5, "y":4.25},
{"label":"3", "x": 19.5, "y":4.25},
{"matrix": [0, 4], "x": 9.25, "y": 2},
{"matrix": [5, 4], "x": 10.25, "y": 2},
{"matrix": [2, 5], "x": 11.25, "y": 2},
{"matrix": [6, 5], "x": 12.25, "y": 2},
{"matrix": [3, 6], "x": 13.5, "y": 2},
{"matrix": [0, 7], "x": 14.5, "y": 2},
{"matrix": [5, 7], "x": 15.5, "y": 2},
{"label":"Lower / 0", "x": 17.5, "y":5.25, "w":2},
{"label":"Raise / .", "x": 19.5, "y":5.25},
{"label":"Enter", "x": 20.5, "y":4.25, "h":2}
{"matrix": [8, 3], "x": 17.5, "y": 2.25},
{"matrix": [9, 3], "x": 18.5, "y": 2.25},
{"matrix": [10, 3], "x": 19.5, "y": 2.25},
{"matrix": [5, 0], "x": 0.5, "y": 3, "w": 2.25},
{"matrix": [2, 1], "x": 2.75, "y": 3},
{"matrix": [6, 1], "x": 4, "y": 3},
{"matrix": [3, 2], "x": 5, "y": 3},
{"matrix": [0, 3], "x": 6, "y": 3},
{"matrix": [4, 3], "x": 7, "y": 3},
{"matrix": [1, 4], "x": 9.25, "y": 3},
{"matrix": [6, 4], "x": 10.25, "y": 3},
{"matrix": [3, 5], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3},
{"matrix": [4, 6], "x": 13.5, "y": 3},
{"matrix": [1, 7], "x": 14.5, "y": 3},
{"matrix": [6, 7], "x": 15.5, "y": 3},
{"matrix": [8, 2], "x": 17.5, "y": 3.25},
{"matrix": [9, 2], "x": 18.5, "y": 3.25},
{"matrix": [10, 2], "x": 19.5, "y": 3.25},
{"matrix": [11, 2], "x": 20.5, "y": 2.25, "h": 2},
{"matrix": [6, 0], "x": 1.25, "y": 4, "w": 1.75},
{"matrix": [7, 1], "x": 3.75, "y": 4.25},
{"matrix": [4, 2], "x": 4.75, "y": 4.25, "w": 2.25},
{"matrix": [5, 3], "x": 7, "y": 4.25},
{"matrix": [2, 4], "x": 9.25, "y": 4.25},
{"matrix": [7, 4], "x": 10.25, "y": 4.25, "w": 2},
{"matrix": [0, 6], "x": 12.25, "y": 4.25},
{"matrix": [5, 6], "x": 13.5, "y": 4},
{"matrix": [2, 7], "x": 14.5, "y": 4},
{"matrix": [7, 7], "x": 15.5, "y": 4},
{"matrix": [8, 1], "x": 17.5, "y": 4.25},
{"matrix": [9, 1], "x": 18.5, "y": 4.25},
{"matrix": [10, 1], "x": 19.5, "y": 4.25},
{"matrix": [8, 0], "x": 17.5, "y": 5.25, "w": 2},
{"matrix": [10, 0], "x": 19.5, "y": 5.25},
{"matrix": [11, 0], "x": 20.5, "y": 4.25, "h": 2}
]
}
}
}

79
keyboards/salicylic_acid3/naked64/rev1/rev1.h
View File

@@ -1,79 +0,0 @@
#pragma once
#include "quantum.h"
//////////////////////////////////////////////////////////////////////////////
// When only use Naked64.
//////////////////////////////////////////////////////////////////////////////
/*
* ,------------------------------------------ -----------------------------------------.
* | L00 | L20 | L70 | L31 | L02 | L52 | L13 | | L63 | L34 | L05 | L45 | L16 | L66 | L37 |
* |------------------------------------------ ------------------------------------------+
* | L10 | L30 | L01 | L41 | L12 | L62 | L23 | | L73 | L44 | L15 | L55 | L26 | L76 | L47 |
* |------------------------------------------ ------------------------------------------+
* | L40 | L11 | L51 | L22 | L72 | L33 | | L04 | L54 | L25 | L65 | L36 | L07 | L57 |
* |------------------------------------ ------------------------------------------+
* | L50 | L21 | L61 | L32 | L03 | L43 | | L14 | L64 | L35 | L75 | L46 | L17 | L67 |
* |------------------------------------ ------------------------------------------+
* | L60 | | L71 | L42 | | L53 | | L24 | L74 | | L06 | L56 | L27 | L77 |
* |------------------------------------ ------------------------------------------'
*/
#define LAYOUT( \
L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, \
L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, \
L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, \
L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, \
L60, L71, L42, L53, L24, L74, L06, L56, L27, L77 \
) \
{ \
{ L00, L01, L02, L03, L04, L05, L06, L07 }, \
{ L10, L11, L12, L13, L14, L15, L16, L17 }, \
{ L20, L21, L22, L23, L24, L25, L26, L27 }, \
{ L30, L31, L32, L33, L34, L35, L36, L37 }, \
{ L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ L50, L51, L52, L53, L54, L55, L56, L57 }, \
{ L60, L61, L62, L63, L64, L65, L66, L67 }, \
{ L70, L71, L72, L73, L74, L75, L76, L77 }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
}
//////////////////////////////////////////////////////////////////////////////
// When connecting Setta21 to Naked64.
//////////////////////////////////////////////////////////////////////////////
#define LAYOUT_with_setta21( \
L00, L20, L70, L31, L02, L52, L13, L63, L34, L05, L45, L16, L66, L37, R05, R15, R25, R35, \
L10, L30, L01, L41, L12, L62, L23, L73, L44, L15, L55, L26, L76, L47, R04, R14, R24, R34, \
L40, L11, L51, L22, L72, L33, L04, L54, L25, L65, L36, L07, L57, R03, R13, R23, \
L50, L21, L61, L32, L03, L43, L14, L64, L35, L75, L46, L17, L67, R02, R12, R22, R32, \
L60, L71, L42, L53, L24, L74, L06, L56, L27, L77, R01, R11, R21, \
R00, R20, R30 \
) \
{ \
{ L00, L01, L02, L03, L04, L05, L06, L07 }, \
{ L10, L11, L12, L13, L14, L15, L16, L17 }, \
{ L20, L21, L22, L23, L24, L25, L26, L27 }, \
{ L30, L31, L32, L33, L34, L35, L36, L37 }, \
{ L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ L50, L51, L52, L53, L54, L55, L56, L57 }, \
{ L60, L61, L62, L63, L64, L65, L66, L67 }, \
{ L70, L71, L72, L73, L74, L75, L76, L77 }, \
{ R00, R01, R02, R03, R04, R05,KC_NO,KC_NO }, \
{KC_NO, R11, R12, R13, R14, R15,KC_NO,KC_NO }, \
{ R20, R21, R22, R23, R24, R25,KC_NO,KC_NO }, \
{ R30,KC_NO, R32,KC_NO, R34, R35,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO }, \
{KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO } \
}