1
0
Fork 0

Move single LAYOUT_alls to data driven (#20430)

This commit is contained in:
Ryan 2023-04-15 21:08:15 +10:00 committed by GitHub
parent a84528f853
commit 172a40686b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
523 changed files with 18787 additions and 20535 deletions

View file

@ -24,71 +24,80 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"x":0 , "y":0, "label":"Esc"},
{"x":1 , "y":0, "label":"Q"},
{"x":2 , "y":0, "label":"W"},
{"x":3 , "y":0, "label":"E"},
{"x":4 , "y":0, "label":"R"},
{"x":5 , "y":0, "label":"T"},
{"x":6 , "y":0, "label":"Y"},
{"x":7 , "y":0, "label":"U"},
{"x":8 , "y":0, "label":"I"},
{"x":9 , "y":0, "label":"O"},
{"x":10 , "y":0, "label":"P"},
{"x":11 , "y":0, "label":"L Bracket"},
{"x":12 , "y":0, "label":"Backspace", "w":1.75},
{"x":14.25, "y":0, "label":"P-7"},
{"x":15.25, "y":0, "label":"P-8"},
{"x":16.25, "y":0, "label":"P-9"},
{"x":17.25, "y":0, "label":"P-Minus"},
{"x":0 , "y":1, "label":"Tab", "w":1.25},
{"x":1.25, "y":1, "label":"A"},
{"x":2.25, "y":1, "label":"S"},
{"x":3.25, "y":1, "label":"D"},
{"x":4.25, "y":1, "label":"F"},
{"x":5.25, "y":1, "label":"G"},
{"x":6.25, "y":1, "label":"H"},
{"x":7.25, "y":1, "label":"J"},
{"x":8.25, "y":1, "label":"K"},
{"x":9.25, "y":1, "label":"L"},
{"x":10.25, "y":1, "label":"Semicolon"},
{"x":11.25, "y":1, "label":"Quote"},
{"x":12.25, "y":1, "label":"Enter", "w":1.5},
{"x":14.25, "y":1, "label":"P-4"},
{"x":15.25, "y":1, "label":"P-5"},
{"x":16.25, "y":1, "label":"P-6"},
{"x":17.25, "y":1, "label":"P-Plus"},
{"x":0 , "y":2, "label":"Left Shift", "w":1.75},
{"x":1.75, "y":2, "label":"Z"},
{"x":2.75, "y":2, "label":"X"},
{"x":3.75, "y":2, "label":"C"},
{"x":4.75, "y":2, "label":"V"},
{"x":5.75, "y":2, "label":"B"},
{"x":6.75, "y":2, "label":"N"},
{"x":7.75, "y":2, "label":"M"},
{"x":8.75, "y":2, "label":"Comma"},
{"x":9.75, "y":2, "label":"Period"},
{"x":10.75, "y":2, "label":"Slash"},
{"x":11.75, "y":2, "label":"Right Shift", "w":1.25},
{"x":13.125,"y":2.125,"label":"Up"},
{"x":14.25, "y":2, "label":"P-1"},
{"x":15.25, "y":2, "label":"P-2"},
{"x":16.25, "y":2, "label":"P-3"},
{"x":17.25, "y":2, "label":"P-Mult"},
{"x":0 , "y":3, "label":"Left Ctrl", "w":1.25},
{"x":1.25 , "y":3, "label":"Left Alt", "w":1.25},
{"x":2.5 , "y":3, "label":"MO(2)"},
{"x":3.5 , "y":3, "label":"Space", "w":2.75},
{"x":6.25 , "y":3, "label":"Space", "w":2.25},
{"x":8.5 , "y":3, "label":"MO(3)"},
{"x":9.5 , "y":3, "label":"R Win / Alt Gr", "w":1.25},
{"x":10.75, "y":3, "label":"MO(1)", "w":1.25},
{"x":12.125,"y":3.125,"label":"Left"},
{"x":13.125,"y":3.125,"label":"Down"},
{"x":14.125,"y":3.125,"label":"Right"},
{"x":15.25 ,"y":3, "label":"P-0"},
{"x":16.25 ,"y":3, "label":"P-Dot"},
{"x":17.25 ,"y":3, "label":"P-Enter"}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [1, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [0, 3], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [0, 5], "x": 10, "y": 0},
{"matrix": [1, 5], "x": 11, "y": 0},
{"matrix": [0, 6], "x": 12, "y": 0, "w": 1.75},
{"matrix": [0, 7], "x": 14.25, "y": 0},
{"matrix": [1, 7], "x": 15.25, "y": 0},
{"matrix": [0, 8], "x": 16.25, "y": 0},
{"matrix": [1, 8], "x": 17.25, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [3, 0], "x": 1.25, "y": 1},
{"matrix": [2, 1], "x": 2.25, "y": 1},
{"matrix": [3, 1], "x": 3.25, "y": 1},
{"matrix": [2, 2], "x": 4.25, "y": 1},
{"matrix": [3, 2], "x": 5.25, "y": 1},
{"matrix": [2, 3], "x": 6.25, "y": 1},
{"matrix": [3, 3], "x": 7.25, "y": 1},
{"matrix": [2, 4], "x": 8.25, "y": 1},
{"matrix": [3, 4], "x": 9.25, "y": 1},
{"matrix": [2, 5], "x": 10.25, "y": 1},
{"matrix": [3, 5], "x": 11.25, "y": 1},
{"matrix": [2, 6], "x": 12.25, "y": 1, "w": 1.5},
{"matrix": [2, 7], "x": 14.25, "y": 1},
{"matrix": [3, 7], "x": 15.25, "y": 1},
{"matrix": [2, 8], "x": 16.25, "y": 1},
{"matrix": [3, 8], "x": 17.25, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [5, 0], "x": 1.75, "y": 2},
{"matrix": [4, 1], "x": 2.75, "y": 2},
{"matrix": [5, 1], "x": 3.75, "y": 2},
{"matrix": [4, 2], "x": 4.75, "y": 2},
{"matrix": [5, 2], "x": 5.75, "y": 2},
{"matrix": [4, 3], "x": 6.75, "y": 2},
{"matrix": [5, 3], "x": 7.75, "y": 2},
{"matrix": [4, 4], "x": 8.75, "y": 2},
{"matrix": [5, 4], "x": 9.75, "y": 2},
{"matrix": [4, 5], "x": 10.75, "y": 2},
{"matrix": [5, 5], "x": 11.75, "y": 2, "w": 1.25},
{"matrix": [4, 6], "x": 13.125, "y": 2.125},
{"matrix": [4, 7], "x": 14.25, "y": 2},
{"matrix": [5, 7], "x": 15.25, "y": 2},
{"matrix": [4, 8], "x": 16.25, "y": 2},
{"matrix": [5, 8], "x": 17.25, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [6, 1], "x": 2.5, "y": 3},
{"matrix": [7, 1], "x": 3.5, "y": 3, "w": 2.75},
{"matrix": [7, 3], "x": 6.25, "y": 3, "w": 2.25},
{"matrix": [6, 4], "x": 8.5, "y": 3},
{"matrix": [7, 4], "x": 9.5, "y": 3, "w": 1.25},
{"matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25},
{"matrix": [7, 5], "x": 12.125, "y": 3.125},
{"matrix": [7, 6], "x": 13.125, "y": 3.125},
{"matrix": [6, 7], "x": 14.125, "y": 3.125},
{"matrix": [7, 7], "x": 15.25, "y": 3},
{"matrix": [6, 8], "x": 16.25, "y": 3},
{"matrix": [7, 8], "x": 17.25, "y": 3}
]
}
}

View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kastenwagen1840.h"
#include "quantum.h"
#ifndef LAYER_LED_DISABLE

View file

@ -1,51 +0,0 @@
/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
*
* 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
#include "quantum.h"
/*
*
* 100101110111120121130131140141150151160 170171180181
*
* 202 203212213222223232233242243252253262 272273282283
*
* 304 305314315324325334335344345354355 374375384385
* 364 487 2u NumEnter
* 406 407 416417 437 446447 456 477486487
* 457467476
*
* 417 7u Space 477 2u Num0
*
*/
#define LAYOUT_all( \
K100 , K101 , K110 , K111 , K120 , K121 , K130 , K131 , K140 , K141 , K150 , K151 , K160 , K170 , K171 , K180 , K181 , \
K202 , K203 , K212 , K213 , K222 , K223 , K232 , K233 , K242 , K243 , K252 , K253 , K262 , K272 , K273 , K282 , K283 , \
K304 , K305 , K314 , K315 , K324 , K325 , K334 , K335 , K344 , K345 , K354 , K355 , K364 , K374 , K375 , K384 , K385 , \
K406 , K407 , K416 , K417 , K437 , K446 , K447 , K456 , K457 , K467 , K476 , K477 , K486 , K487 \
) \
{ \
{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170 , K180 }, \
{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, K171 , K181 }, \
{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272 , K282 }, \
{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, K273 , K283 }, \
{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374 , K384 }, \
{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, K375 , K385 }, \
{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476 , K486 }, \
{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , K477 , K487 } \
}

View file

@ -24,59 +24,67 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"x":0 , "y":0, "label":"Esc"},
{"x":1 , "y":0, "label":"Q"},
{"x":2 , "y":0, "label":"W"},
{"x":3 , "y":0, "label":"E"},
{"x":4 , "y":0, "label":"R"},
{"x":5 , "y":0, "label":"T"},
{"x":6 , "y":0, "label":"Y"},
{"x":7 , "y":0, "label":"U"},
{"x":8 , "y":0, "label":"I"},
{"x":9 , "y":0, "label":"O"},
{"x":10 , "y":0, "label":"P"},
{"x":11 , "y":0, "label":"L Bracket"},
{"x":12 , "y":0, "label":"Backspace", "w":1.75},
{"x":14.25, "y":0, "label":"Delete"},
{"x":0 , "y":1, "label":"Tab", "w":1.25},
{"x":1.25, "y":1, "label":"A"},
{"x":2.25, "y":1, "label":"S"},
{"x":3.25, "y":1, "label":"D"},
{"x":4.25, "y":1, "label":"F"},
{"x":5.25, "y":1, "label":"G"},
{"x":6.25, "y":1, "label":"H"},
{"x":7.25, "y":1, "label":"J"},
{"x":8.25, "y":1, "label":"K"},
{"x":9.25, "y":1, "label":"L"},
{"x":10.25, "y":1, "label":"Semicolon"},
{"x":11.25, "y":1, "label":"Quote"},
{"x":12.25, "y":1, "label":"Enter", "w":1.5},
{"x":14.25, "y":1, "label":"Pg Up"},
{"x":0 , "y":2, "label":"Left Shift", "w":1.75},
{"x":1.75, "y":2, "label":"Z"},
{"x":2.75, "y":2, "label":"X"},
{"x":3.75, "y":2, "label":"C"},
{"x":4.75, "y":2, "label":"V"},
{"x":5.75, "y":2, "label":"B"},
{"x":6.75, "y":2, "label":"N"},
{"x":7.75, "y":2, "label":"M"},
{"x":8.75, "y":2, "label":"Comma"},
{"x":9.75, "y":2, "label":"Period"},
{"x":10.75, "y":2, "label":"Slash"},
{"x":11.75, "y":2, "label":"Right Shift", "w":1.25},
{"x":13.125,"y":2.125,"label":"Up"},
{"x":14.25, "y":2, "label":"Pg Dn"},
{"x":0 , "y":3, "label":"Left Ctrl", "w":1.25},
{"x":1.25 , "y":3, "label":"Left Alt", "w":1.25},
{"x":2.5 , "y":3, "label":"MO(2)"},
{"x":3.5 , "y":3, "label":"Space", "w":2.75},
{"x":6.25 , "y":3, "label":"Space", "w":2.25},
{"x":8.5 , "y":3, "label":"MO(3)"},
{"x":9.5 , "y":3, "label":"R Win / Alt Gr", "w":1.25},
{"x":10.75, "y":3, "label":"MO(1)", "w":1.25},
{"x":12.125,"y":3.125,"label":"Left"},
{"x":13.125,"y":3.125,"label":"Down"},
{"x":14.125,"y":3.125,"label":"Right"}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 1], "x": 2, "y": 0},
{"matrix": [1, 1], "x": 3, "y": 0},
{"matrix": [0, 2], "x": 4, "y": 0},
{"matrix": [1, 2], "x": 5, "y": 0},
{"matrix": [0, 3], "x": 6, "y": 0},
{"matrix": [1, 3], "x": 7, "y": 0},
{"matrix": [0, 4], "x": 8, "y": 0},
{"matrix": [1, 4], "x": 9, "y": 0},
{"matrix": [0, 5], "x": 10, "y": 0},
{"matrix": [1, 5], "x": 11, "y": 0},
{"matrix": [0, 6], "x": 12, "y": 0, "w": 1.75},
{"matrix": [0, 7], "x": 14.25, "y": 0},
{"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [3, 0], "x": 1.25, "y": 1},
{"matrix": [2, 1], "x": 2.25, "y": 1},
{"matrix": [3, 1], "x": 3.25, "y": 1},
{"matrix": [2, 2], "x": 4.25, "y": 1},
{"matrix": [3, 2], "x": 5.25, "y": 1},
{"matrix": [2, 3], "x": 6.25, "y": 1},
{"matrix": [3, 3], "x": 7.25, "y": 1},
{"matrix": [2, 4], "x": 8.25, "y": 1},
{"matrix": [3, 4], "x": 9.25, "y": 1},
{"matrix": [2, 5], "x": 10.25, "y": 1},
{"matrix": [3, 5], "x": 11.25, "y": 1},
{"matrix": [2, 6], "x": 12.25, "y": 1, "w": 1.5},
{"matrix": [2, 7], "x": 14.25, "y": 1},
{"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [5, 0], "x": 1.75, "y": 2},
{"matrix": [4, 1], "x": 2.75, "y": 2},
{"matrix": [5, 1], "x": 3.75, "y": 2},
{"matrix": [4, 2], "x": 4.75, "y": 2},
{"matrix": [5, 2], "x": 5.75, "y": 2},
{"matrix": [4, 3], "x": 6.75, "y": 2},
{"matrix": [5, 3], "x": 7.75, "y": 2},
{"matrix": [4, 4], "x": 8.75, "y": 2},
{"matrix": [5, 4], "x": 9.75, "y": 2},
{"matrix": [4, 5], "x": 10.75, "y": 2},
{"matrix": [5, 5], "x": 11.75, "y": 2, "w": 1.25},
{"matrix": [4, 6], "x": 13.125, "y": 2.125},
{"matrix": [4, 7], "x": 14.25, "y": 2},
{"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [6, 1], "x": 2.5, "y": 3},
{"matrix": [7, 1], "x": 3.5, "y": 3, "w": 2.75},
{"matrix": [7, 3], "x": 6.25, "y": 3, "w": 2.25},
{"matrix": [6, 4], "x": 8.5, "y": 3},
{"matrix": [7, 4], "x": 9.5, "y": 3, "w": 1.25},
{"matrix": [6, 5], "x": 10.75, "y": 3, "w": 1.25},
{"matrix": [7, 5], "x": 12.125, "y": 3.125},
{"matrix": [7, 6], "x": 13.125, "y": 3.125},
{"matrix": [6, 7], "x": 14.125, "y": 3.125}
]
}
}

View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "kastenwagen48.h"
#include "quantum.h"
#ifndef LAYER_LED_DISABLE

View file

@ -1,51 +0,0 @@
/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
*
* 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
#include "quantum.h"
/*
*
* 100101110111120121130131140141150151160 170
*
* 202 203212213222223232233242243252253262 272
*
* 304 305314315324325334335344345354355 374
* 364
* 406 407 416417 437 446447 456
* 457467476
*
* 417 7u Space
*
*/
#define LAYOUT_all( \
K100 , K101 , K110 , K111 , K120 , K121 , K130 , K131 , K140 , K141 , K150 , K151 , K160 , K170 , \
K202 , K203 , K212 , K213 , K222 , K223 , K232 , K233 , K242 , K243 , K252 , K253 , K262 , K272 , \
K304 , K305 , K314 , K315 , K324 , K325 , K334 , K335 , K344 , K345 , K354 , K355 , K364 , K374 , \
K406 , K407 , K416 , K417 , K437 , K446 , K447 , K456 , K457 , K467 , K476 \
) \
{ \
{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170 }, \
{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, KC_NO }, \
{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272 }, \
{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, KC_NO }, \
{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374 }, \
{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, KC_NO }, \
{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476 }, \
{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , KC_NO } \
}