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
523 changed files with 18787 additions and 20535 deletions

View File

@@ -21,76 +21,84 @@
"layouts": {
"LAYOUT_all": {
"layout": [
{"x":0.5, "y":0},
{"x":1.75, "y":0},
{"x":2.75, "y":0},
{"x":3.75, "y":0},
{"x":4.75, "y":0},
{"x":5.75, "y":0},
{"x":6.75, "y":0},
{"x":7.75, "y":0},
{"x":10, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15, "y":0},
{"x":16, "y":0},
{"x":17, "y":0},
{"matrix": [0, 0], "x": 0.5, "y": 0},
{"x":0.25, "y":1},
{"x":1.5, "y":1, "w":1.5},
{"x":3, "y":1},
{"x":4, "y":1},
{"x":5, "y":1},
{"x":6, "y":1},
{"x":7, "y":1},
{"x":9.5, "y":1},
{"x":10.5, "y":1},
{"x":11.5, "y":1},
{"x":12.5, "y":1},
{"x":13.5, "y":1},
{"x":14.5, "y":1},
{"x":15.5, "y":1},
{"x":16.5, "y":1, "w":1.5},
{"matrix": [1, 0], "x": 1.75, "y": 0},
{"matrix": [0, 1], "x": 2.75, "y": 0},
{"matrix": [1, 1], "x": 3.75, "y": 0},
{"matrix": [0, 2], "x": 4.75, "y": 0},
{"matrix": [1, 2], "x": 5.75, "y": 0},
{"matrix": [0, 3], "x": 6.75, "y": 0},
{"matrix": [1, 3], "x": 7.75, "y": 0},
{"x":0, "y":2},
{"x":1.5, "y":2, "w":1.75},
{"x":3.25, "y":2},
{"x":4.25, "y":2},
{"x":5.25, "y":2},
{"x":6.25, "y":2},
{"x":7.25, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2},
{"x":11.75, "y":2},
{"x":12.75, "y":2},
{"x":13.75, "y":2},
{"x":14.75, "y":2},
{"x":15.75, "y":2, "w":2.25},
{"matrix": [0, 4], "x": 10, "y": 0},
{"matrix": [1, 4], "x": 11, "y": 0},
{"matrix": [0, 5], "x": 12, "y": 0},
{"matrix": [1, 5], "x": 13, "y": 0},
{"matrix": [0, 6], "x": 14, "y": 0},
{"matrix": [1, 6], "x": 15, "y": 0},
{"matrix": [0, 7], "x": 16, "y": 0},
{"matrix": [1, 7], "x": 17, "y": 0},
{"x":1.5, "y":3, "w":2.25},
{"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":9.25, "y":3},
{"x":10.25, "y":3},
{"x":11.25, "y":3},
{"x":12.25, "y":3},
{"x":13.25, "y":3},
{"x":14.25, "y":3},
{"x":15.25, "y":3, "w":1.75},
{"x":17, "y":3},
{"matrix": [2, 0], "x": 0.25, "y": 1},
{"x":1.5, "y":4, "w":1.5},
{"x":4, "y":4, "w":1.5},
{"x":5.5, "y":4, "w":2},
{"x":7.5, "y":4, "w":1.25},
{"x":9.25, "y":4, "w":2.75},
{"x":12, "y":4, "w":1.5},
{"x":16.5, "y":4, "w":1.5}
{"matrix": [3, 0], "x": 1.5, "y": 1, "w": 1.5},
{"matrix": [2, 1], "x": 3, "y": 1},
{"matrix": [3, 1], "x": 4, "y": 1},
{"matrix": [2, 2], "x": 5, "y": 1},
{"matrix": [3, 2], "x": 6, "y": 1},
{"matrix": [2, 3], "x": 7, "y": 1},
{"matrix": [2, 4], "x": 9.5, "y": 1},
{"matrix": [3, 4], "x": 10.5, "y": 1},
{"matrix": [2, 5], "x": 11.5, "y": 1},
{"matrix": [3, 5], "x": 12.5, "y": 1},
{"matrix": [2, 6], "x": 13.5, "y": 1},
{"matrix": [3, 6], "x": 14.5, "y": 1},
{"matrix": [2, 7], "x": 15.5, "y": 1},
{"matrix": [3, 7], "x": 16.5, "y": 1, "w": 1.5},
{"matrix": [4, 0], "x": 0, "y": 2},
{"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
{"matrix": [4, 1], "x": 3.25, "y": 2},
{"matrix": [5, 1], "x": 4.25, "y": 2},
{"matrix": [4, 2], "x": 5.25, "y": 2},
{"matrix": [5, 2], "x": 6.25, "y": 2},
{"matrix": [4, 3], "x": 7.25, "y": 2},
{"matrix": [4, 4], "x": 9.75, "y": 2},
{"matrix": [5, 4], "x": 10.75, "y": 2},
{"matrix": [4, 5], "x": 11.75, "y": 2},
{"matrix": [5, 5], "x": 12.75, "y": 2},
{"matrix": [4, 6], "x": 13.75, "y": 2},
{"matrix": [5, 6], "x": 14.75, "y": 2},
{"matrix": [5, 7], "x": 15.75, "y": 2, "w": 2.25},
{"matrix": [7, 0], "x": 1.5, "y": 3, "w": 2.25},
{"matrix": [6, 1], "x": 3.75, "y": 3},
{"matrix": [7, 1], "x": 4.75, "y": 3},
{"matrix": [6, 2], "x": 5.75, "y": 3},
{"matrix": [7, 2], "x": 6.75, "y": 3},
{"matrix": [6, 3], "x": 7.75, "y": 3},
{"matrix": [6, 4], "x": 9.25, "y": 3},
{"matrix": [7, 4], "x": 10.25, "y": 3},
{"matrix": [6, 5], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3},
{"matrix": [6, 6], "x": 13.25, "y": 3},
{"matrix": [7, 6], "x": 14.25, "y": 3},
{"matrix": [6, 7], "x": 15.25, "y": 3, "w": 1.75},
{"matrix": [7, 7], "x": 17, "y": 3},
{"matrix": [8, 0], "x": 1.5, "y": 4, "w": 1.5},
{"matrix": [8, 1], "x": 4, "y": 4, "w": 1.5},
{"matrix": [8, 2], "x": 5.5, "y": 4, "w": 2},
{"matrix": [8, 3], "x": 7.5, "y": 4, "w": 1.25},
{"matrix": [8, 4], "x": 9.25, "y": 4, "w": 2.75},
{"matrix": [8, 5], "x": 12, "y": 4, "w": 1.5},
{"matrix": [8, 7], "x": 16.5, "y": 4, "w": 1.5}
]
}
}

View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lune.h"
#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {

View File

@@ -1,47 +0,0 @@
/* Copyright 2022 Ramon Imbao
*
* 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"
/* This is a shortcut to help you visually see your layout.
*
* The first section contains all of the arguments representing the physical
* layout of the board and position of the keys.
*
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
#define ___ KC_NO
#define LAYOUT_all( \
k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
k20, k30, k21, k31, k22, k32, k23, k24, k34, k25, k35, k26, k36, k27, k37, \
k40, k50, k41, k51, k42, k52, k43, k44, k54, k45, k55, k46, k56, k57, \
k70, k61, k71, k62, k72, k63, k64, k74, k65, k75, k66, k76, k67, k77, \
k80, k81, k82, k83, k84, k85, k87 \
) { \
{ 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, ___, k34, k35, k36, k37 }, \
{ k40, k41, k42, k43, k44, k45, k46, ___ }, \
{ k50, k51, k52, ___, k54, k55, k56, k57 }, \
{ ___, k61, k62, k63, k64, k65, k66, k67 }, \
{ k70, k71, k72, ___, k74, k75, k76, k77 }, \
{ k80, k81, k82, k83, k84, k85, ___, k87 }, \
}