1
0
Fork 0

Move Alice and Ergodox layouts to data driven (#20340)

This commit is contained in:
Ryan 2023-04-05 15:50:56 +10:00 committed by GitHub
parent 6847dba8af
commit 09a2b70a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 8550 additions and 6611 deletions

View file

@ -16,79 +16,89 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice_split_bs"],
"layout_aliases": {
"LAYOUT_all": "LAYOUT_alice_split_bs"
},
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
{"x":0, "y":0},
{"x":1.25, "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":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},
{"x":16.25, "y":0},
{"x":17.25, "y":0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"x":0, "y":1},
{"x":1.25, "y":1, "w":1.5},
{"x":2.75, "y":1},
{"x":3.75, "y":1},
{"x":4.75, "y":1},
{"x":5.75, "y":1},
{"x":6.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},
{"x":16.75, "y":1, "w":1.5},
{"matrix": [0, 1], "x": 1.25, "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},
{"x":0, "y":2},
{"x":1.25, "y":2, "w":1.75},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "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},
{"x":16, "y":2, "w":2.25},
{"matrix": [0, 8], "x": 10.25, "y": 0},
{"matrix": [0, 9], "x": 11.25, "y": 0},
{"matrix": [0, 10], "x": 12.25, "y": 0},
{"matrix": [0, 11], "x": 13.25, "y": 0},
{"matrix": [0, 12], "x": 14.25, "y": 0},
{"matrix": [0, 13], "x": 15.25, "y": 0},
{"matrix": [0, 14], "x": 16.25, "y": 0},
{"matrix": [2, 14], "x": 17.25, "y": 0},
{"x":1.25, "y":3, "w":2.25},
{"x":3.5, "y":3},
{"x":4.5, "y":3},
{"x":5.5, "y":3},
{"x":6.5, "y":3},
{"x":7.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},
{"x":15.5, "y":3, "w":1.75},
{"x":17.25, "y":3},
{"matrix": [1, 0], "x": 0, "y": 1},
{"x":1.25, "y":4, "w":1.5},
{"x":4.25, "y":4, "w":1.5},
{"x":5.75, "y":4, "w":2},
{"x":7.75, "y":4, "w":1.25},
{"x":9.5, "y":4, "w":2.75},
{"x":12.25, "y":4, "w":1.5},
{"x":16.75, "y":4, "w":1.5}
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"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": 9.75, "y": 1},
{"matrix": [1, 8], "x": 10.75, "y": 1},
{"matrix": [1, 9], "x": 11.75, "y": 1},
{"matrix": [1, 10], "x": 12.75, "y": 1},
{"matrix": [1, 11], "x": 13.75, "y": 1},
{"matrix": [1, 12], "x": 14.75, "y": 1},
{"matrix": [1, 13], "x": 15.75, "y": 1},
{"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"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": 10, "y": 2},
{"matrix": [2, 8], "x": 11, "y": 2},
{"matrix": [2, 9], "x": 12, "y": 2},
{"matrix": [2, 10], "x": 13, "y": 2},
{"matrix": [2, 11], "x": 14, "y": 2},
{"matrix": [2, 12], "x": 15, "y": 2},
{"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 3.5, "y": 3},
{"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": 9.5, "y": 3},
{"matrix": [3, 8], "x": 10.5, "y": 3},
{"matrix": [3, 9], "x": 11.5, "y": 3},
{"matrix": [3, 10], "x": 12.5, "y": 3},
{"matrix": [3, 11], "x": 13.5, "y": 3},
{"matrix": [3, 12], "x": 14.5, "y": 3},
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 17.25, "y": 3},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
{"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
{"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
]
}
}

View file

@ -1,37 +0,0 @@
/* Copyright 2020 Harrison Chan (Xelus)
*
* 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 ____ KC_NO
#define LAYOUT_alice_split_bs( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \
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, \
K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
K401, K403, K405, K406, K408, K410, 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 }, \
{ ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
{ ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ } \
}
#define LAYOUT_all LAYOUT_alice_split_bs

View file

@ -19,79 +19,88 @@
"processor": "STM32L422",
"bootloader": "stm32-dfu",
"community_layouts": ["alice_split_bs"],
"layout_aliases": {
"LAYOUT_all": "LAYOUT_alice_split_bs"
},
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
{"x":0, "y":0},
{"x":1.25, "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":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},
{"x":16.25, "y":0},
{"x":17.25, "y":0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"x":0, "y":1},
{"x":1.25, "y":1, "w":1.5},
{"x":2.75, "y":1},
{"x":3.75, "y":1},
{"x":4.75, "y":1},
{"x":5.75, "y":1},
{"x":6.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},
{"x":16.75, "y":1, "w":1.5},
{"matrix": [0, 1], "x": 1.25, "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},
{"x":0, "y":2},
{"x":1.25, "y":2, "w":1.75},
{"x":3, "y":2},
{"x":4, "y":2},
{"x":5, "y":2},
{"x":6, "y":2},
{"x":7, "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},
{"x":16, "y":2, "w":2.25},
{"matrix": [0, 8], "x": 10.25, "y": 0},
{"matrix": [0, 9], "x": 11.25, "y": 0},
{"matrix": [0, 10], "x": 12.25, "y": 0},
{"matrix": [0, 11], "x": 13.25, "y": 0},
{"matrix": [0, 12], "x": 14.25, "y": 0},
{"matrix": [0, 13], "x": 15.25, "y": 0},
{"matrix": [0, 14], "x": 16.25, "y": 0},
{"matrix": [2, 14], "x": 17.25, "y": 0},
{"x":1.25, "y":3, "w":2.25},
{"x":3.5, "y":3},
{"x":4.5, "y":3},
{"x":5.5, "y":3},
{"x":6.5, "y":3},
{"x":7.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},
{"x":15.5, "y":3, "w":1.75},
{"x":17.25, "y":3},
{"matrix": [1, 0], "x": 0, "y": 1},
{"x":1.25, "y":4, "w":1.5},
{"x":4.25, "y":4, "w":1.5},
{"x":5.75, "y":4, "w":2},
{"x":7.75, "y":4, "w":1.25},
{"x":9.5, "y":4, "w":2.75},
{"x":12.25, "y":4, "w":1.5},
{"x":16.75, "y":4, "w":1.5}
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 2.75, "y": 1},
{"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": 9.75, "y": 1},
{"matrix": [1, 8], "x": 10.75, "y": 1},
{"matrix": [1, 9], "x": 11.75, "y": 1},
{"matrix": [1, 10], "x": 12.75, "y": 1},
{"matrix": [1, 11], "x": 13.75, "y": 1},
{"matrix": [1, 12], "x": 14.75, "y": 1},
{"matrix": [1, 13], "x": 15.75, "y": 1},
{"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"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": 10, "y": 2},
{"matrix": [2, 8], "x": 11, "y": 2},
{"matrix": [2, 9], "x": 12, "y": 2},
{"matrix": [2, 10], "x": 13, "y": 2},
{"matrix": [2, 11], "x": 14, "y": 2},
{"matrix": [2, 12], "x": 15, "y": 2},
{"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 3.5, "y": 3},
{"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": 9.5, "y": 3},
{"matrix": [3, 8], "x": 10.5, "y": 3},
{"matrix": [3, 9], "x": 11.5, "y": 3},
{"matrix": [3, 10], "x": 12.5, "y": 3},
{"matrix": [3, 11], "x": 13.5, "y": 3},
{"matrix": [3, 12], "x": 14.5, "y": 3},
{"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 17.25, "y": 3},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
{"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
{"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
{"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
{"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
{"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
{"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
]
}
}

View file

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

View file

@ -1,37 +0,0 @@
/* Copyright 2021 Harrison Chan (Xelus)
*
* 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 ____ KC_NO
#define LAYOUT_alice_split_bs( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \
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, \
K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
K401, K403, K405, K406, K408, K410, 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 }, \
{ ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
{ ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ } \
}
#define LAYOUT_all LAYOUT_alice_split_bs