1
0
Fork 0

Move single LAYOUTs to data driven (#20365)

This commit is contained in:
Ryan 2023-04-12 13:42:51 +10:00 committed by GitHub
parent 941e159a28
commit 5bd68e3695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1443 changed files with 45214 additions and 59923 deletions

View file

@ -27,15 +27,95 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{"y":0, "x":0},
{"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15},
{"y":2, "x":0},{"y":2, "x":1},{"y":2, "x":2},{"y":2, "x":3},{"y":2, "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":3, "x":0},{"y":3, "x":1},{"y":3, "x":2},{"y":3, "x":3},{"y":3, "x":4},{"y":3, "x":5},{"y":3, "x":6},{"y":3, "x":7},{"y":3, "x":8},{"y":3, "x":9},{"y":3, "x":10},{"y":3, "x":11},{"y":3, "x":12},{"y":3, "x":13},{"y":3, "x":14},{"y":3, "x":15},
{"y":4, "x":0},{"y":4, "x":1},{"y":4, "x":2},{"y":4, "x":3},{"y":4, "x":4},{"y":4, "x":5},{"y":4, "x":6},{"y":4, "x":7},{"y":4, "x":8},{"y":4, "x":9},{"y":4, "x":10},{"y":4, "x":11},{"y":4, "x":12},{"y":4, "x":13},{"y":4, "x":14},{"y":4, "x":15},
{"y":5, "x":0},{"y":5, "x":1},{"y":5, "x":2},{"y":5, "x":3},{"y":5, "x":4},{"y":5, "x":5},{"y":5, "x":6},{"y":5, "x":7},{"y":5, "x":8},{"y":5, "x":9},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15}
]
}
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [0, 1], "x": 1, "y": 1},
{"matrix": [0, 2], "x": 2, "y": 1},
{"matrix": [0, 3], "x": 3, "y": 1},
{"matrix": [0, 4], "x": 4, "y": 1},
{"matrix": [0, 5], "x": 5, "y": 1},
{"matrix": [0, 6], "x": 6, "y": 1},
{"matrix": [0, 7], "x": 7, "y": 1},
{"matrix": [0, 8], "x": 8, "y": 1},
{"matrix": [0, 9], "x": 9, "y": 1},
{"matrix": [0, 10], "x": 10, "y": 1},
{"matrix": [0, 11], "x": 11, "y": 1},
{"matrix": [0, 12], "x": 12, "y": 1},
{"matrix": [0, 13], "x": 13, "y": 1},
{"matrix": [0, 14], "x": 14, "y": 1},
{"matrix": [0, 15], "x": 15, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [1, 1], "x": 1, "y": 2},
{"matrix": [1, 2], "x": 2, "y": 2},
{"matrix": [1, 3], "x": 3, "y": 2},
{"matrix": [1, 4], "x": 4, "y": 2},
{"matrix": [1, 5], "x": 5, "y": 2},
{"matrix": [1, 6], "x": 6, "y": 2},
{"matrix": [1, 7], "x": 7, "y": 2},
{"matrix": [1, 8], "x": 8, "y": 2},
{"matrix": [1, 9], "x": 9, "y": 2},
{"matrix": [1, 10], "x": 10, "y": 2},
{"matrix": [1, 11], "x": 11, "y": 2},
{"matrix": [1, 12], "x": 12, "y": 2},
{"matrix": [1, 13], "x": 13, "y": 2},
{"matrix": [1, 14], "x": 14, "y": 2},
{"matrix": [1, 15], "x": 15, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [2, 1], "x": 1, "y": 3},
{"matrix": [2, 2], "x": 2, "y": 3},
{"matrix": [2, 3], "x": 3, "y": 3},
{"matrix": [2, 4], "x": 4, "y": 3},
{"matrix": [2, 5], "x": 5, "y": 3},
{"matrix": [2, 6], "x": 6, "y": 3},
{"matrix": [2, 7], "x": 7, "y": 3},
{"matrix": [2, 8], "x": 8, "y": 3},
{"matrix": [2, 9], "x": 9, "y": 3},
{"matrix": [2, 10], "x": 10, "y": 3},
{"matrix": [2, 11], "x": 11, "y": 3},
{"matrix": [2, 12], "x": 12, "y": 3},
{"matrix": [2, 13], "x": 13, "y": 3},
{"matrix": [2, 14], "x": 14, "y": 3},
{"matrix": [2, 15], "x": 15, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [3, 1], "x": 1, "y": 4},
{"matrix": [3, 2], "x": 2, "y": 4},
{"matrix": [3, 3], "x": 3, "y": 4},
{"matrix": [3, 4], "x": 4, "y": 4},
{"matrix": [3, 5], "x": 5, "y": 4},
{"matrix": [3, 6], "x": 6, "y": 4},
{"matrix": [3, 7], "x": 7, "y": 4},
{"matrix": [3, 8], "x": 8, "y": 4},
{"matrix": [3, 9], "x": 9, "y": 4},
{"matrix": [3, 10], "x": 10, "y": 4},
{"matrix": [3, 11], "x": 11, "y": 4},
{"matrix": [3, 12], "x": 12, "y": 4},
{"matrix": [3, 13], "x": 13, "y": 4},
{"matrix": [3, 14], "x": 14, "y": 4},
{"matrix": [3, 15], "x": 15, "y": 4},
{"matrix": [5, 0], "x": 0, "y": 5},
{"matrix": [4, 1], "x": 1, "y": 5},
{"matrix": [4, 2], "x": 2, "y": 5},
{"matrix": [4, 3], "x": 3, "y": 5},
{"matrix": [4, 4], "x": 4, "y": 5},
{"matrix": [4, 5], "x": 5, "y": 5},
{"matrix": [4, 6], "x": 6, "y": 5},
{"matrix": [4, 7], "x": 7, "y": 5},
{"matrix": [4, 8], "x": 8, "y": 5},
{"matrix": [4, 9], "x": 9, "y": 5},
{"matrix": [4, 10], "x": 10, "y": 5},
{"matrix": [4, 11], "x": 11, "y": 5},
{"matrix": [4, 12], "x": 12, "y": 5},
{"matrix": [4, 13], "x": 13, "y": 5},
{"matrix": [4, 14], "x": 14, "y": 5},
{"matrix": [4, 15], "x": 15, "y": 5}
]
}
}
}

View file

@ -1,36 +0,0 @@
/*
Copyright 2021 Bryan Ong
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"
#define LAYOUT( \
K000, \
K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
K400, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
K500, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215}, \
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315}, \
{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415}, \
{ K500 } \
}

View file

@ -27,15 +27,87 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{"y":0, "x":0},
{"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15},
{"y":2, "x":0, "w":1.5},{"y":2, "x":1.5},{"y":2, "x":2.5},{"y":2, "x":3.5},{"y":2, "x":4.5},{"y":2, "x":5.5},{"y":2, "x":6.5},{"y":2, "x":7.5},{"y":2, "x":8.5},{"y":2, "x":9.5},{"y":2, "x":10.5},{"y":2, "x":11.5},{"y":2, "x":12.5},{"y":2, "x":13.5, "w":1.5},{"y":2, "x":15},
{"y":3, "x":0, "w":1.75},{"y":3, "x":1.75},{"y":3, "x":2.75},{"y":3, "x":3.75},{"y":3, "x":4.75},{"y":3, "x":5.75},{"y":3, "x":6.75},{"y":3, "x":7.75},{"y":3, "x":8.75},{"y":3, "x":9.75},{"y":3, "x":10.75},{"y":3, "x":11.75},{"y":3, "x":12.75, "w":2.25},{"y":3, "x":15},
{"y":4, "x":0,"w":1.25},{"y":4, "x":1.25},{"y":4, "x":2.25},{"y":4, "x":3.25},{"y":4, "x":4.25},{"y":4, "x":5.25},{"y":4, "x":6.25},{"y":4, "x":7.25},{"y":4, "x":8.25},{"y":4, "x":9.25},{"y":4, "x":10.25},{"y":4, "x":11.25},{"y":4, "x":12.25, "w":1.75},{"y":4, "x":14},{"y":4, "x":15},
{"y":5, "x":0,"w":1.25},{"y":5, "x":1.25,"w":1.25},{"y":5, "x":2.5,"w":1.25},{"y":5, "x":3.75,"w":1.25},{"y":5, "x":5,"w":2.25},{"y":5, "x":7.25,"w":2.75},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15}
]
}
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [0, 1], "x": 1, "y": 1},
{"matrix": [0, 2], "x": 2, "y": 1},
{"matrix": [0, 3], "x": 3, "y": 1},
{"matrix": [0, 4], "x": 4, "y": 1},
{"matrix": [0, 5], "x": 5, "y": 1},
{"matrix": [0, 6], "x": 6, "y": 1},
{"matrix": [0, 7], "x": 7, "y": 1},
{"matrix": [0, 8], "x": 8, "y": 1},
{"matrix": [0, 9], "x": 9, "y": 1},
{"matrix": [0, 10], "x": 10, "y": 1},
{"matrix": [0, 11], "x": 11, "y": 1},
{"matrix": [0, 12], "x": 12, "y": 1},
{"matrix": [0, 13], "x": 13, "y": 1},
{"matrix": [0, 14], "x": 14, "y": 1},
{"matrix": [1, 14], "x": 15, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 2},
{"matrix": [1, 2], "x": 2.5, "y": 2},
{"matrix": [1, 3], "x": 3.5, "y": 2},
{"matrix": [1, 4], "x": 4.5, "y": 2},
{"matrix": [1, 5], "x": 5.5, "y": 2},
{"matrix": [1, 6], "x": 6.5, "y": 2},
{"matrix": [1, 7], "x": 7.5, "y": 2},
{"matrix": [1, 8], "x": 8.5, "y": 2},
{"matrix": [1, 9], "x": 9.5, "y": 2},
{"matrix": [1, 10], "x": 10.5, "y": 2},
{"matrix": [1, 11], "x": 11.5, "y": 2},
{"matrix": [1, 12], "x": 12.5, "y": 2},
{"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
{"matrix": [2, 14], "x": 15, "y": 2},
{"matrix": [2, 1], "x": 0, "y": 3, "w": 1.75},
{"matrix": [2, 2], "x": 1.75, "y": 3},
{"matrix": [2, 3], "x": 2.75, "y": 3},
{"matrix": [2, 4], "x": 3.75, "y": 3},
{"matrix": [2, 5], "x": 4.75, "y": 3},
{"matrix": [2, 6], "x": 5.75, "y": 3},
{"matrix": [2, 7], "x": 6.75, "y": 3},
{"matrix": [2, 8], "x": 7.75, "y": 3},
{"matrix": [2, 9], "x": 8.75, "y": 3},
{"matrix": [2, 10], "x": 9.75, "y": 3},
{"matrix": [2, 11], "x": 10.75, "y": 3},
{"matrix": [2, 12], "x": 11.75, "y": 3},
{"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
{"matrix": [3, 14], "x": 15, "y": 3},
{"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 4},
{"matrix": [3, 2], "x": 2.25, "y": 4},
{"matrix": [3, 3], "x": 3.25, "y": 4},
{"matrix": [3, 4], "x": 4.25, "y": 4},
{"matrix": [3, 5], "x": 5.25, "y": 4},
{"matrix": [3, 6], "x": 6.25, "y": 4},
{"matrix": [3, 7], "x": 7.25, "y": 4},
{"matrix": [3, 8], "x": 8.25, "y": 4},
{"matrix": [3, 9], "x": 9.25, "y": 4},
{"matrix": [3, 10], "x": 10.25, "y": 4},
{"matrix": [3, 11], "x": 11.25, "y": 4},
{"matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
{"matrix": [3, 13], "x": 14, "y": 4},
{"matrix": [4, 14], "x": 15, "y": 4},
{"matrix": [4, 1], "x": 0, "y": 5, "w": 1.25},
{"matrix": [4, 2], "x": 1.25, "y": 5, "w": 1.25},
{"matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
{"matrix": [4, 4], "x": 3.75, "y": 5, "w": 1.25},
{"matrix": [4, 5], "x": 5, "y": 5, "w": 2.25},
{"matrix": [4, 6], "x": 7.25, "y": 5, "w": 2.75},
{"matrix": [4, 8], "x": 10, "y": 5},
{"matrix": [4, 9], "x": 11, "y": 5},
{"matrix": [4, 10], "x": 12, "y": 5},
{"matrix": [4, 11], "x": 13, "y": 5},
{"matrix": [4, 12], "x": 14, "y": 5},
{"matrix": [4, 13], "x": 15, "y": 5}
]
}
}
}

View file

@ -1,35 +0,0 @@
/*
Copyright 2021 Bryan Ong
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"
#define LAYOUT( \
K000, \
K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, \
K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \
K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K314, \
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K414, \
K401, K402, K403, K404, K405, K406, K408, K409, K410, K411, K412, K413 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
{ KC_NO, K401, K402, K403, K404, K405, K406, KC_NO, K408, K409, K410, K411, K412, K413, K414 } \
}