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

Move single LAYOUTs to data driven (#20365)

Browse Source
This commit is contained in:
Ryan
2023-04-12 13:42:51 +10:00
committed by GitHub
parent 941e159a28
commit 5bd68e3695
1443 changed files with 45214 additions and 59923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/lfkeyboards/lfk78/lfk78.h
View File

@@ -3,7 +3,7 @@
#include "quantum.h"
#if defined(KEYBOARD_lfkeyboards_lfk78_revb)
# include "revb.h"
# include QMK_KEYBOARD_H
#elif defined(KEYBOARD_lfkeyboards_lfk78_revc)
# include "revc.h"
#elif defined(KEYBOARD_lfkeyboards_lfk78_revj)

165
keyboards/lfkeyboards/lfk78/revb/info.json
View File

@@ -25,97 +25,88 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0},
{"matrix": [0, 7], "x": 7.25, "y": 0},
{"matrix": [5, 0], "x": 8.25, "y": 0},
{"matrix": [5, 1], "x": 9.25, "y": 0},
{"matrix": [5, 2], "x": 10.25, "y": 0},
{"matrix": [5, 3], "x": 11.25, "y": 0},
{"matrix": [5, 4], "x": 12.25, "y": 0},
{"matrix": [5, 5], "x": 13.25, "y": 0},
{"matrix": [5, 6], "x": 14.25, "y": 0},
{"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
{"matrix": [9, 4], "x": 17.5, "y": 0},
{"matrix": [9, 5], "x": 18.5, "y": 0},
{"x":2.25, "y":0},
{"x":3.25, "y":0},
{"x":4.25, "y":0},
{"x":5.25, "y":0},
{"x":6.25, "y":0},
{"x":7.25, "y":0},
{"x":8.25, "y":0},
{"x":9.25, "y":0},
{"x":10.25, "y":0},
{"x":11.25, "y":0},
{"x":12.25, "y":0},
{"x":13.25, "y":0},
{"x":14.25, "y":0},
{"x":15.25, "y":0, "w":2},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
{"matrix": [1, 3], "x": 3.75, "y": 1},
{"matrix": [1, 4], "x": 4.75, "y": 1},
{"matrix": [1, 5], "x": 5.75, "y": 1},
{"matrix": [1, 6], "x": 6.75, "y": 1},
{"matrix": [1, 7], "x": 7.75, "y": 1},
{"matrix": [6, 0], "x": 8.75, "y": 1},
{"matrix": [6, 1], "x": 9.75, "y": 1},
{"matrix": [6, 2], "x": 10.75, "y": 1},
{"matrix": [6, 3], "x": 11.75, "y": 1},
{"matrix": [6, 4], "x": 12.75, "y": 1},
{"matrix": [6, 5], "x": 13.75, "y": 1},
{"matrix": [6, 6], "x": 14.75, "y": 1},
{"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
{"matrix": [9, 6], "x": 17.5, "y": 1},
{"matrix": [9, 7], "x": 18.5, "y": 1},
{"x":17.5, "y":0},
{"x":18.5, "y":0},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [2, 4], "x": 5, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [7, 0], "x": 9, "y": 2},
{"matrix": [7, 1], "x": 10, "y": 2},
{"matrix": [7, 2], "x": 11, "y": 2},
{"matrix": [7, 3], "x": 12, "y": 2},
{"matrix": [7, 4], "x": 13, "y": 2},
{"matrix": [7, 5], "x": 14, "y": 2},
{"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
{"x":0, "y":1},
{"x":1, "y":1},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 4.5, "y": 3},
{"matrix": [3, 4], "x": 5.5, "y": 3},
{"matrix": [3, 5], "x": 6.5, "y": 3},
{"matrix": [3, 6], "x": 7.5, "y": 3},
{"matrix": [3, 7], "x": 8.5, "y": 3},
{"matrix": [8, 0], "x": 9.5, "y": 3},
{"matrix": [8, 1], "x": 10.5, "y": 3},
{"matrix": [8, 2], "x": 11.5, "y": 3},
{"matrix": [8, 3], "x": 12.5, "y": 3},
{"matrix": [8, 4], "x": 13.5, "y": 3},
{"matrix": [8, 5], "x": 14.5, "y": 3, "w": 2.75},
{"matrix": [8, 6], "x": 17.5, "y": 3},
{"x":2.25, "y":1, "w":1.5},
{"x":3.75, "y":1},
{"x":4.75, "y":1},
{"x":5.75, "y":1},
{"x":6.75, "y":1},
{"x":7.75, "y":1},
{"x":8.75, "y":1},
{"x":9.75, "y":1},
{"x":10.75, "y":1},
{"x":11.75, "y":1},
{"x":12.75, "y":1},
{"x":13.75, "y":1},
{"x":14.75, "y":1},
{"x":15.75, "y":1, "w":1.5},
{"x":17.5, "y":1},
{"x":18.5, "y":1},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2.25, "y":2, "w":1.75},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "y":2},
{"x":8, "y":2},
{"x":9, "y":2},
{"x":10, "y":2},
{"x":11, "y":2},
{"x":12, "y":2},
{"x":13, "y":2},
{"x":14, "y":2},
{"x":15, "y":2, "w":2.25},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2.25, "y":3, "w":2.25},
{"x":4.5, "y":3},
{"x":5.5, "y":3},
{"x":6.5, "y":3},
{"x":7.5, "y":3},
{"x":8.5, "y":3},
{"x":9.5, "y":3},
{"x":10.5, "y":3},
{"x":11.5, "y":3},
{"x":12.5, "y":3},
{"x":13.5, "y":3},
{"x":14.5, "y":3, "w":2.75},
{"x":17.5, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2.25, "y":4, "w":1.25},
{"x":3.5, "y":4, "w":1.25},
{"x":4.75, "y":4, "w":1.25},
{"x":6, "y":4, "w":6.25},
{"x":12.25, "y":4, "w":1.25},
{"x":13.5, "y":4, "w":1.25},
{"x":14.75, "y":4, "w":1.25},
{"x":16.5, "y":4},
{"x":17.5, "y":4},
{"x":18.5, "y":4}
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
{"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
{"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 6, "y": 4, "w": 6.25},
{"matrix": [4, 6], "x": 12.25, "y": 4, "w": 1.25},
{"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.25},
{"matrix": [9, 0], "x": 14.75, "y": 4, "w": 1.25},
{"matrix": [9, 1], "x": 16.5, "y": 4},
{"matrix": [9, 2], "x": 17.5, "y": 4},
{"matrix": [9, 3], "x": 18.5, "y": 4}
]
}
}

41
keyboards/lfkeyboards/lfk78/revb/revb.h
View File

@@ -1,41 +0,0 @@
#pragma once
#include "lfk78.h"
// readability
#define XXX KC_NO
// This is a shortcut to help you visually see your layout.
/*
* ,---------. ,-----------------------------------------------------------------------. ,---------.
* | 0 | 1 | | 2 | 3 | 4 | 5 | 6 | 7 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | | 94 | 95 |
* |---------| |-----------------------------------------------------------------------| |---------|
* | 10 | 11 | | 12 | 13 | 14 | 15 | 16 | 17 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | | 96 | 97 |
* |---------| |-----------------------------------------------------------------------| `---------'
* | 20 | 21 | | 22 | 23 | 24 | 25 | 26 | 27 | 70 | 71 | 72 | 73 | 74 | 75 | 76 |
* |---------| |-----------------------------------------------------------------------| ,----.
* | 30 | 31 | | 32 | 33 | 34 | 35 | 36 | 37 | 80 | 81 | 82 | 83 | 84 | 85 | | 86 |
* |---------| |-------------------------------------------------------------------------------------.
* | 40 | 41 | | 42 | 43 | 44 | 45 | 46 | 47 | 90 | | 91 | 92 | 93 |
* `---------' `--------------------------------------------------------------------' `--------------'
*/
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54, k55, k56, k57, k94, k95, \
k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, k96, k97, \
k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73, k74, k75, k76, \
k30, k31, k32, k33, k34, k35, k36, k37, k80, k81, k82, k83, k84, k85, k86, \
k40, k41, k42, k43, k44, k45, k46, k47, k90, k91, k92, k93 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07 }, \
{ k10, k11, k12, k13, k14, k15, k16, k17 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27 }, \
{ k30, k31, k32, k33, k34, k35, k36, k37 }, \
{ k40, k41, k42, k43, k44, k45, k46, k47 }, \
{ k50, k51, k52, k53, k54, k55, k56, k57 }, \
{ k60, k61, k62, k63, k64, k65, k66, k67 }, \
{ k70, k71, k72, k73, k74, k75, k76, XXX }, \
{ k80, k81, k82, k83, k84, k85, k86, XXX }, \
{ k90, k91, k92, k93, k94, k95, k96, k97 } \
}

171
keyboards/lfkeyboards/mini1800/info.json
View File

@@ -23,92 +23,99 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Esc", "x":0, "y":0},
{"label":"1!", "x":1, "y":0},
{"label":"2@", "x":2, "y":0},
{"label":"3#", "x":3, "y":0},
{"label":"4$", "x":4, "y":0},
{"label":"5%", "x":5, "y":0},
{"label":"6^", "x":6, "y":0},
{"label":"7&", "x":7, "y":0},
{"label":"8*", "x":8, "y":0},
{"label":"9(", "x":9, "y":0},
{"label":"0)", "x":10, "y":0},
{"label":"-_", "x":11, "y":0},
{"label":"=+", "x":12, "y":0},
{"label":"Back Space", "x":13, "y":0, "w":2},
{"label":"Num Lock", "x":15.5, "y":0},
{"label":"/", "x":16.5, "y":0},
{"label":"*", "x":17.5, "y":0},
{"label":"-", "x":18.5, "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},
{"matrix": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0},
{"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
{"label":"Tab", "x":0, "y":1, "w":1.5},
{"label":"Q", "x":1.5, "y":1},
{"label":"W", "x":2.5, "y":1},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1},
{"label":"T", "x":5.5, "y":1},
{"label":"Y", "x":6.5, "y":1},
{"label":"U", "x":7.5, "y":1},
{"label":"I", "x":8.5, "y":1},
{"label":"O", "x":9.5, "y":1},
{"label":"P", "x":10.5, "y":1},
{"label":"[{", "x":11.5, "y":1},
{"label":"]}", "x":12.5, "y":1},
{"label":"\\|", "x":13.5, "y":1, "w":1.5},
{"label":"7", "x":15.5, "y":1},
{"label":"8", "x":16.5, "y":1},
{"label":"9", "x":17.5, "y":1},
{"label":"+", "x":18.5, "y":1},
{"matrix": [0, 15], "x": 15.5, "y": 0},
{"matrix": [0, 16], "x": 16.5, "y": 0},
{"matrix": [0, 17], "x": 17.5, "y": 0},
{"matrix": [0, 18], "x": 18.5, "y": 0},
{"label":"Caps Lock", "x":0, "y":2, "w":1.25},
{"label":"A", "x":1.75, "y":2},
{"label":"S", "x":2.75, "y":2},
{"label":"D", "x":3.75, "y":2},
{"label":"F", "x":4.75, "y":2},
{"label":"G", "x":5.75, "y":2},
{"label":"H", "x":6.75, "y":2},
{"label":"J", "x":7.75, "y":2},
{"label":"K", "x":8.75, "y":2},
{"label":"L", "x":9.75, "y":2},
{"label":";:", "x":10.75, "y":2},
{"label":"'\"", "x":11.75, "y":2},
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
{"label":"4", "x":15.5, "y":2},
{"label":"5", "x":16.5, "y":2},
{"label":"6", "x":17.5, "y":2},
{"label":"+", "x":18.5, "y":2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [1, 9], "x": 9.5, "y": 1},
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
{"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"label":"Shift", "x":0, "y":3, "w":2.25},
{"label":"Z", "x":2.25, "y":3},
{"label":"X", "x":3.25, "y":3},
{"label":"C", "x":4.25, "y":3},
{"label":"V", "x":5.25, "y":3},
{"label":"B", "x":6.25, "y":3},
{"label":"N", "x":7.25, "y":3},
{"label":"M", "x":8.25, "y":3},
{"label":",<", "x":9.25, "y":3},
{"label":".>", "x":10.25, "y":3},
{"label":"/?", "x":11.25, "y":3},
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
{"label":"\u2191", "x":14.25, "y":3.25},
{"label":"1", "x":15.5, "y":3},
{"label":"2", "x":16.5, "y":3},
{"label":"3", "x":17.5, "y":3},
{"label":"Enter", "x":18.5, "y":3, "h":2},
{"matrix": [1, 15], "x": 15.5, "y": 1},
{"matrix": [1, 16], "x": 16.5, "y": 1},
{"matrix": [1, 17], "x": 17.5, "y": 1},
{"matrix": [1, 18], "x": 18.5, "y": 1},
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
{"label":"Win", "x":1.25, "y":4, "w":1.25},
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
{"label":"Space", "x":3.75, "y":4, "w":6.25},
{"label":"Alt", "x":10, "y":4},
{"label":"Fn", "x":11, "y":4},
{"label":"Ctrl", "x":12, "y":4},
{"label":"\u2190", "x":13.25, "y":4.25},
{"label":"\u2193", "x":14.25, "y":4.25},
{"label":"\u2192", "x":15.25, "y":4.25},
{"label":"0", "x":16.5, "y":4},
{"label":".", "x":17.5, "y":4}
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2},
{"matrix": [1, 14], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 15.5, "y": 2},
{"matrix": [2, 16], "x": 16.5, "y": 2},
{"matrix": [2, 17], "x": 17.5, "y": 2},
{"matrix": [2, 18], "x": 18.5, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 2.25, "y": 3},
{"matrix": [3, 3], "x": 3.25, "y": 3},
{"matrix": [3, 4], "x": 4.25, "y": 3},
{"matrix": [3, 5], "x": 5.25, "y": 3},
{"matrix": [3, 6], "x": 6.25, "y": 3},
{"matrix": [3, 7], "x": 7.25, "y": 3},
{"matrix": [3, 8], "x": 8.25, "y": 3},
{"matrix": [3, 9], "x": 9.25, "y": 3},
{"matrix": [3, 10], "x": 10.25, "y": 3},
{"matrix": [3, 11], "x": 11.25, "y": 3},
{"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 14.25, "y": 3.25},
{"matrix": [3, 15], "x": 15.5, "y": 3},
{"matrix": [3, 16], "x": 16.5, "y": 3},
{"matrix": [3, 17], "x": 17.5, "y": 3},
{"matrix": [3, 18], "x": 18.5, "y": 3, "h": 2},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 10], "x": 10, "y": 4},
{"matrix": [4, 11], "x": 11, "y": 4},
{"matrix": [4, 12], "x": 12, "y": 4},
{"matrix": [4, 14], "x": 13.25, "y": 4.25},
{"matrix": [4, 15], "x": 14.25, "y": 4.25},
{"matrix": [4, 16], "x": 15.25, "y": 4.25},
{"matrix": [4, 17], "x": 16.5, "y": 4},
{"matrix": [4, 18], "x": 17.5, "y": 4}
]
}
}

20
keyboards/lfkeyboards/mini1800/mini1800.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "quantum.h"
#include QMK_KEYBOARD_H
#include "matrix.h"
#include <avr/sfr_defs.h>
@@ -25,21 +25,3 @@ extern const Layer_Info layer_info[];
void reset_keyboard_kb(void);
void click(uint16_t freq, uint16_t duration);
#define ___ KC_NO
#ifndef LAYOUT
# define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, k0I, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, k1I, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1E, k2F, k2G, k2H, k2I, \
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, k3G, k3H, k3I, \
k40, k41, k42, k45, k4A, k4B, k4C, k4E, k4F, k4G, k4H, k4I \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F, k0G, k0H, k0I }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, ___, k2F, k2G, k2H, k2I }, \
{ k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \
{ k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, k4E, k4F, k4G, k4H, k4I } \
}
#endif // !LAYOUT #endif