summaryrefslogtreecommitdiff
path: root/keyboards/adpenrose
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/adpenrose
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/adpenrose')
-rw-r--r--keyboards/adpenrose/kintsugi/info.json130
-rw-r--r--keyboards/adpenrose/kintsugi/kintsugi.c2
-rw-r--r--keyboards/adpenrose/kintsugi/kintsugi.h46
3 files changed, 66 insertions, 112 deletions
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
index 1014362503..3daf3326ac 100644
--- a/keyboards/adpenrose/kintsugi/info.json
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -26,75 +26,75 @@
26 "layouts": { 26 "layouts": {
27 "LAYOUT": { 27 "LAYOUT": {
28 "layout": [ 28 "layout": [
29 {"label":"Esc", "x":0, "y":0}, 29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"label":"1", "x":1, "y":0}, 30 {"matrix": [0, 1], "x": 1, "y": 0},
31 {"label":"2", "x":2, "y":0}, 31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"label":"3", "x":3, "y":0}, 32 {"matrix": [0, 3], "x": 3, "y": 0},
33 {"label":"4", "x":4, "y":0}, 33 {"matrix": [0, 4], "x": 4, "y": 0},
34 {"label":"5", "x":5, "y":0}, 34 {"matrix": [0, 5], "x": 5, "y": 0},
35 {"label":"6", "x":6, "y":0}, 35 {"matrix": [0, 6], "x": 6, "y": 0},
36 {"label":"7", "x":7, "y":0}, 36 {"matrix": [5, 0], "x": 7, "y": 0},
37 {"label":"8", "x":8, "y":0}, 37 {"matrix": [5, 1], "x": 8, "y": 0},
38 {"label":"9", "x":9, "y":0}, 38 {"matrix": [5, 2], "x": 9, "y": 0},
39 {"label":"0", "x":10, "y":0}, 39 {"matrix": [5, 3], "x": 10, "y": 0},
40 {"label":"-", "x":11, "y":0}, 40 {"matrix": [5, 4], "x": 11, "y": 0},
41 {"label":"=", "x":12, "y":0}, 41 {"matrix": [5, 5], "x": 12, "y": 0},
42 {"label":"Backspace", "x":13, "y":0, "w":2}, 42 {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
43 43
44 {"label":"Tab", "x":0, "y":1, "w":1.5}, 44 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
45 {"label":"Q", "x":1.5, "y":1}, 45 {"matrix": [1, 1], "x": 1.5, "y": 1},
46 {"label":"W", "x":2.5, "y":1}, 46 {"matrix": [1, 2], "x": 2.5, "y": 1},
47 {"label":"E", "x":3.5, "y":1}, 47 {"matrix": [1, 3], "x": 3.5, "y": 1},
48 {"label":"R", "x":4.5, "y":1}, 48 {"matrix": [1, 4], "x": 4.5, "y": 1},
49 {"label":"T", "x":5.5, "y":1}, 49 {"matrix": [1, 5], "x": 5.5, "y": 1},
50 {"label":"Y", "x":6.5, "y":1}, 50 {"matrix": [1, 6], "x": 6.5, "y": 1},
51 {"label":"U", "x":7.5, "y":1}, 51 {"matrix": [6, 0], "x": 7.5, "y": 1},
52 {"label":"I", "x":8.5, "y":1}, 52 {"matrix": [6, 1], "x": 8.5, "y": 1},
53 {"label":"O", "x":9.5, "y":1}, 53 {"matrix": [6, 2], "x": 9.5, "y": 1},
54 {"label":"P", "x":10.5, "y":1}, 54 {"matrix": [6, 3], "x": 10.5, "y": 1},
55 {"label":"[", "x":11.5, "y":1}, 55 {"matrix": [6, 4], "x": 11.5, "y": 1},
56 {"label":"]", "x":12.5, "y":1}, 56 {"matrix": [6, 5], "x": 12.5, "y": 1},
57 {"label":"\\", "x":13.5, "y":1, "w":1.5}, 57 {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
58 58
59 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, 59 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
60 {"label":"A", "x":1.75, "y":2}, 60 {"matrix": [2, 1], "x": 1.75, "y": 2},
61 {"label":"S", "x":2.75, "y":2}, 61 {"matrix": [2, 2], "x": 2.75, "y": 2},
62 {"label":"D", "x":3.75, "y":2}, 62 {"matrix": [2, 3], "x": 3.75, "y": 2},
63 {"label":"F", "x":4.75, "y":2}, 63 {"matrix": [2, 4], "x": 4.75, "y": 2},
64 {"label":"G", "x":5.75, "y":2}, 64 {"matrix": [2, 5], "x": 5.75, "y": 2},
65 {"label":"H", "x":6.75, "y":2}, 65 {"matrix": [2, 6], "x": 6.75, "y": 2},
66 {"label":"J", "x":7.75, "y":2}, 66 {"matrix": [7, 0], "x": 7.75, "y": 2},
67 {"label":"K", "x":8.75, "y":2}, 67 {"matrix": [7, 1], "x": 8.75, "y": 2},
68 {"label":"L", "x":9.75, "y":2}, 68 {"matrix": [7, 2], "x": 9.75, "y": 2},
69 {"label":";", "x":10.75, "y":2}, 69 {"matrix": [7, 3], "x": 10.75, "y": 2},
70 {"label":"'", "x":11.75, "y":2}, 70 {"matrix": [7, 4], "x": 11.75, "y": 2},
71 {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 71 {"matrix": [7, 5], "x": 12.75, "y": 2, "w": 2.25},
72 {"label":"Enc", "x":15, "y":2}, 72 {"matrix": [7, 6], "x": 15, "y": 2},
73 73
74 {"label":"LShift", "x":0, "y":3, "w":2.25}, 74 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
75 {"label":"Z", "x":2.25, "y":3}, 75 {"matrix": [3, 1], "x": 2.25, "y": 3},
76 {"label":"X", "x":3.25, "y":3}, 76 {"matrix": [3, 2], "x": 3.25, "y": 3},
77 {"label":"C", "x":4.25, "y":3}, 77 {"matrix": [3, 3], "x": 4.25, "y": 3},
78 {"label":"V", "x":5.25, "y":3}, 78 {"matrix": [3, 4], "x": 5.25, "y": 3},
79 {"label":"B", "x":6.25, "y":3}, 79 {"matrix": [3, 5], "x": 6.25, "y": 3},
80 {"label":"N", "x":7.25, "y":3}, 80 {"matrix": [3, 6], "x": 7.25, "y": 3},
81 {"label":"M", "x":8.25, "y":3}, 81 {"matrix": [8, 0], "x": 8.25, "y": 3},
82 {"label":",", "x":9.25, "y":3}, 82 {"matrix": [8, 1], "x": 9.25, "y": 3},
83 {"label":".", "x":10.25, "y":3}, 83 {"matrix": [8, 2], "x": 10.25, "y": 3},
84 {"label":"/", "x":11.25, "y":3}, 84 {"matrix": [8, 3], "x": 11.25, "y": 3},
85 {"label":"RShift", "x":12.25, "y":3, "w":1.75}, 85 {"matrix": [8, 4], "x": 12.25, "y": 3, "w": 1.75},
86 {"label":"Up", "x":14, "y":3}, 86 {"matrix": [8, 5], "x": 14, "y": 3},
87 {"label":"M1", "x":15, "y":3}, 87 {"matrix": [8, 6], "x": 15, "y": 3},
88 88
89 {"label":"LCtrl", "x":0, "y":4, "w":1.25}, 89 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
90 {"label":"LSuper", "x":1.25, "y":4, "w":1.25}, 90 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
91 {"label":"LAlt", "x":2.5, "y":4, "w":1.25}, 91 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
92 {"label":"Space", "x":3.75, "y":4, "w":6.25}, 92 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
93 {"label":"L1", "x":10, "y":4, "w":1.5}, 93 {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.5},
94 {"label":"L2", "x":11.5, "y":4, "w":1.5}, 94 {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.5},
95 {"label":"Left", "x":13, "y":4}, 95 {"matrix": [9, 4], "x": 13, "y": 4},
96 {"label":"Down", "x":14, "y":4}, 96 {"matrix": [9, 5], "x": 14, "y": 4},
97 {"label":"Right", "x":15, "y":4} 97 {"matrix": [9, 6], "x": 15, "y": 4}
98 ] 98 ]
99 } 99 }
100 } 100 }
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c
index 59e7d79b55..0fd26d317e 100644
--- a/keyboards/adpenrose/kintsugi/kintsugi.c
+++ b/keyboards/adpenrose/kintsugi/kintsugi.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "kintsugi.h" 17#include "quantum.h"
18 18
19#ifdef OLED_ENABLE 19#ifdef OLED_ENABLE
20oled_rotation_t oled_init_kb(oled_rotation_t rotation) { 20oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h
deleted file mode 100644
index 728ef72d0a..0000000000
--- a/keyboards/adpenrose/kintsugi/kintsugi.h
+++ /dev/null
@@ -1,46 +0,0 @@
1/* Copyright 2022 adpenrose
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29#define LAYOUT( \
30 K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, \
31 K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \
32 K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \
33 K30, K31, K32, K33, K34, K35, K36, K80, K81, K82, K83, K84, K85, K86, \
34 K40, K41, K42, K46, K92, K93, K94, K95, K96 \
35) { \
36 { K00, K01, K02, K03, K04, K05, K06 }, \
37 { K10, K11, K12, K13, K14, K15, K16 }, \
38 { K20, K21, K22, K23, K24, K25, K26 }, \
39 { K30, K31, K32, K33, K34, K35, K36 }, \
40 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46 }, \
41 { K50, K51, K52, K53, K54, K55, K56 }, \
42 { K60, K61, K62, K63, K64, K65, K66 }, \
43 { K70, K71, K72, K73, K74, K75, K76 }, \
44 { K80, K81, K82, K83, K84, K85, K86 }, \
45 { KC_NO, KC_NO, K92, K93, K94, K95, K96 } \
46}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:38:05 +0000