Move single LAYOUT
s to data driven (#20365)
This commit is contained in:
@@ -21,47 +21,51 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{ "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 },
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.42, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [0, 1], "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [0, 2], "x": 1.68, "y": 0, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [0, 3], "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [0, 4], "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84},
|
||||
|
||||
{ "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 },
|
||||
{"matrix": [0, 5], "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [0, 6], "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 0], "x": 7.56, "y": 0, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 1], "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 2], "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84},
|
||||
|
||||
{ "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 },
|
||||
{"matrix": [1, 3], "x": 0, "y": 1.26, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 4], "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 5], "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [1, 6], "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [2, 0], "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84},
|
||||
|
||||
{ "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 },
|
||||
{ "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 }
|
||||
{"matrix": [2, 1], "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [2, 2], "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [2, 3], "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [2, 4], "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [2, 5], "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84},
|
||||
|
||||
{"matrix": [2, 6], "x": 0, "y": 2.1, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 0], "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 1], "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 2], "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 3], "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84},
|
||||
|
||||
{"matrix": [3, 4], "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 5], "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [3, 6], "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [4, 0], "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [4, 1], "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84},
|
||||
|
||||
{"matrix": [4, 2], "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [4, 3], "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [4, 4], "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [4, 5], "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84},
|
||||
|
||||
{"matrix": [4, 6], "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [5, 0], "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [5, 1], "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84},
|
||||
{"matrix": [5, 2], "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
// Copyright 2022 takashicompany (@takashicompany)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "minizone.h"
|
||||
#include "quantum.h"
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
||||
|
@@ -1,30 +0,0 @@
|
||||
// Copyright 2022 takashicompany (@takashicompany)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#define XXX KC_NO
|
||||
|
||||
/* 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 LAYOUT( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, \
|
||||
k13, k14, k15, k16, k20, k21, k22, k23, k24, k25, \
|
||||
k26, k30, k31, k32, k33, k34, k35, k36, k40, k41, \
|
||||
k42, k43, k44, k45, k46, k50, k51, k52 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06 }, \
|
||||
{ k10, k11, k12, k13, k14, k15, k16 }, \
|
||||
{ k20, k21, k22, k23, k24, k25, k26 }, \
|
||||
{ k30, k31, k32, k33, k34, k35, k36 }, \
|
||||
{ k40, k41, k42, k43, k44, k45, k46 }, \
|
||||
{ k50, k51, k52, XXX, XXX, XXX, XXX } \
|
||||
}
|
Reference in New Issue
Block a user