summaryrefslogtreecommitdiff
path: root/keyboards/adpenrose
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:08:15 +1000
committerGitHub <noreply@github.com>2023-04-15 21:08:15 +1000
commit172a40686b84af7f887350a20c526855c7f7649c (patch)
tree435d6c9a8b06edff988deaa00964629d81d55d64 /keyboards/adpenrose
parenta84528f85392ccab60fd7130fecb83972539367f (diff)
Move single `LAYOUT_all`s to data driven (#20430)
Diffstat (limited to 'keyboards/adpenrose')
-rw-r--r--keyboards/adpenrose/akemipad/akemipad.c2
-rw-r--r--keyboards/adpenrose/akemipad/akemipad.h31
-rw-r--r--keyboards/adpenrose/akemipad/info.json56
-rw-r--r--keyboards/adpenrose/obi/info.json110
-rw-r--r--keyboards/adpenrose/obi/obi.h26
-rw-r--r--keyboards/adpenrose/shisaku/info.json55
-rw-r--r--keyboards/adpenrose/shisaku/shisaku.h32
7 files changed, 143 insertions, 169 deletions
diff --git a/keyboards/adpenrose/akemipad/akemipad.c b/keyboards/adpenrose/akemipad/akemipad.c
index 647740927c..993396dca0 100644
--- a/keyboards/adpenrose/akemipad/akemipad.c
+++ b/keyboards/adpenrose/akemipad/akemipad.c
@@ -1,7 +1,7 @@
1// Copyright 2022 Arturo Avila (@ADPenrose) 1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later 2// SPDX-License-Identifier: GPL-2.0-or-later
3 3
4#include "akemipad.h" 4#include "quantum.h"
5 5
6#ifdef RGB_MATRIX_ENABLE 6#ifdef RGB_MATRIX_ENABLE
7 7
diff --git a/keyboards/adpenrose/akemipad/akemipad.h b/keyboards/adpenrose/akemipad/akemipad.h
deleted file mode 100644
index 2e4b13baef..0000000000
--- a/keyboards/adpenrose/akemipad/akemipad.h
+++ /dev/null
@@ -1,31 +0,0 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16
17#define LAYOUT_all( \
18 K00, K01, K02, K03, \
19 K10, K11, K12, K13, \
20 K20, K21, K22, K23, \
21 K30, K31, K32, K33, \
22 K40, K41, K42, K43, \
23 K54, K50, K51, K52, K53 \
24) { \
25 { K00, K01, K02, K03, KC_NO }, \
26 { K10, K11, K12, K13, KC_NO }, \
27 { K20, K21, K22, K23, KC_NO }, \
28 { K30, K31, K32, K33, KC_NO }, \
29 { K40, K41, K42, K43, KC_NO }, \
30 { K50, K51, K52, K53, K54 } \
31}
diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json
index 6dc558c78e..95f1c903e5 100644
--- a/keyboards/adpenrose/akemipad/info.json
+++ b/keyboards/adpenrose/akemipad/info.json
@@ -28,31 +28,37 @@
28 "layouts": { 28 "layouts": {
29 "LAYOUT_all": { 29 "LAYOUT_all": {
30 "layout": [ 30 "layout": [
31 { "label": "F1", "x": 1.25, "y": 0 }, 31 {"matrix": [0, 0], "x": 1.25, "y": 0},
32 { "label": "F2", "x": 2.25, "y": 0 }, 32 {"matrix": [0, 1], "x": 2.25, "y": 0},
33 { "label": "F3", "x": 3.25, "y": 0 }, 33 {"matrix": [0, 2], "x": 3.25, "y": 0},
34 { "label": "F4", "x": 4.25, "y": 0 }, 34 {"matrix": [0, 3], "x": 4.25, "y": 0},
35 { "label": "Num Lock", "x": 1.25, "y": 1.25 }, 35
36 { "label": "/", "x": 2.25, "y": 1.25 }, 36 {"matrix": [1, 0], "x": 1.25, "y": 1.25},
37 { "label": "*", "x": 3.25, "y": 1.25 }, 37 {"matrix": [1, 1], "x": 2.25, "y": 1.25},
38 { "label": "-", "x": 4.25, "y": 1.25 }, 38 {"matrix": [1, 2], "x": 3.25, "y": 1.25},
39 { "label": "7", "x": 1.25, "y": 2.25 }, 39 {"matrix": [1, 3], "x": 4.25, "y": 1.25},
40 { "label": "8", "x": 2.25, "y": 2.25 }, 40
41 { "label": "9", "x": 3.25, "y": 2.25 }, 41 {"matrix": [2, 0], "x": 1.25, "y": 2.25},
42 { "x": 4.25, "y": 2.25 }, 42 {"matrix": [2, 1], "x": 2.25, "y": 2.25},
43 { "label": "4", "x": 1.25, "y": 3.25 }, 43 {"matrix": [2, 2], "x": 3.25, "y": 2.25},
44 { "label": "5", "x": 2.25, "y": 3.25 }, 44 {"matrix": [2, 3], "x": 4.25, "y": 2.25},
45 { "label": "6", "x": 3.25, "y": 3.25 }, 45
46 { "x": 4.25, "y": 3.25 }, 46 {"matrix": [3, 0], "x": 1.25, "y": 3.25},
47 { "label": "1", "x": 1.25, "y": 4.25 }, 47 {"matrix": [3, 1], "x": 2.25, "y": 3.25},
48 { "label": "2", "x": 2.25, "y": 4.25 }, 48 {"matrix": [3, 2], "x": 3.25, "y": 3.25},
49 { "label": "3", "x": 3.25, "y": 4.25 }, 49 {"matrix": [3, 3], "x": 4.25, "y": 3.25},
50 { "x": 4.25, "y": 4.25 }, 50
51 { "label": "Enc", "x": 0, "y": 5.25 }, 51 {"matrix": [4, 0], "x": 1.25, "y": 4.25},
52 { "x": 1.25, "y": 5.25 }, 52 {"matrix": [4, 1], "x": 2.25, "y": 4.25},
53 { "x": 2.25, "y": 5.25 }, 53 {"matrix": [4, 2], "x": 3.25, "y": 4.25},
54 { "label": ".", "x": 3.25, "y": 5.25 }, 54 {"matrix": [4, 3], "x": 4.25, "y": 4.25},
55 { "x": 4.25, "y": 5.25 } 55
56 {"matrix": [5, 4], "x": 0, "y": 5.25},
57
58 {"matrix": [5, 0], "x": 1.25, "y": 5.25},
59 {"matrix": [5, 1], "x": 2.25, "y": 5.25},
60 {"matrix": [5, 2], "x": 3.25, "y": 5.25},
61 {"matrix": [5, 3], "x": 4.25, "y": 5.25}
56 ] 62 ]
57 } 63 }
58 } 64 }
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c3e8d7b43b..3f16b579df 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -25,60 +25,64 @@
25 "layouts": { 25 "layouts": {
26 "LAYOUT_all": { 26 "LAYOUT_all": {
27 "layout": [ 27 "layout": [
28 {"label":"F1", "x":0, "y":0}, 28 {"matrix": [0, 0], "x": 0, "y": 0},
29 {"label":"Tab", "x":1.25, "y":0, "w":1.5},
30 {"label":"Q", "x":2.75, "y":0},
31 {"label":"W", "x":3.75, "y":0},
32 {"label":"E", "x":4.75, "y":0},
33 {"label":"R", "x":5.75, "y":0},
34 {"label":"T", "x":6.75, "y":0},
35 {"label":"Y", "x":7.75, "y":0},
36 {"label":"U", "x":8.75, "y":0},
37 {"label":"I", "x":9.75, "y":0},
38 {"label":"O", "x":10.75, "y":0},
39 {"label":"P", "x":11.75, "y":0},
40 {"label":"{", "x":12.75, "y":0},
41 {"label":"Backspace", "x":13.75, "y":0, "w":1.5},
42 29
43 {"label":"F2", "x":0, "y":1}, 30 {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
44 {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, 31 {"matrix": [0, 2], "x": 2.75, "y": 0},
45 {"label":"A", "x":3, "y":1}, 32 {"matrix": [0, 3], "x": 3.75, "y": 0},
46 {"label":"S", "x":4, "y":1}, 33 {"matrix": [0, 4], "x": 4.75, "y": 0},
47 {"label":"D", "x":5, "y":1}, 34 {"matrix": [0, 5], "x": 5.75, "y": 0},
48 {"label":"F", "x":6, "y":1}, 35 {"matrix": [0, 6], "x": 6.75, "y": 0},
49 {"label":"G", "x":7, "y":1}, 36 {"matrix": [0, 7], "x": 7.75, "y": 0},
50 {"label":"H", "x":8, "y":1}, 37 {"matrix": [0, 8], "x": 8.75, "y": 0},
51 {"label":"J", "x":9, "y":1}, 38 {"matrix": [0, 9], "x": 9.75, "y": 0},
52 {"label":"K", "x":10, "y":1}, 39 {"matrix": [0, 10], "x": 10.75, "y": 0},
53 {"label":"L", "x":11, "y":1}, 40 {"matrix": [0, 11], "x": 11.75, "y": 0},
54 {"label":":", "x":12, "y":1}, 41 {"matrix": [0, 12], "x": 12.75, "y": 0},
55 {"label":"Enter", "x":13, "y":1, "w":2.25}, 42 {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
56 43
57 {"label":"F3", "x":0, "y":2}, 44 {"matrix": [1, 0], "x": 0, "y": 1},
58 {"label":"Shift", "x":1.25, "y":2, "w":2.25}, 45
59 {"label":"Z", "x":3.5, "y":2}, 46 {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
60 {"label":"X", "x":4.5, "y":2}, 47 {"matrix": [1, 2], "x": 3, "y": 1},
61 {"label":"C", "x":5.5, "y":2}, 48 {"matrix": [1, 3], "x": 4, "y": 1},
62 {"label":"V", "x":6.5, "y":2}, 49 {"matrix": [1, 4], "x": 5, "y": 1},
63 {"label":"B", "x":7.5, "y":2}, 50 {"matrix": [1, 5], "x": 6, "y": 1},
64 {"label":"N", "x":8.5, "y":2}, 51 {"matrix": [1, 6], "x": 7, "y": 1},
65 {"label":"M", "x":9.5, "y":2}, 52 {"matrix": [1, 7], "x": 8, "y": 1},
66 {"label":"<", "x":10.5, "y":2}, 53 {"matrix": [1, 8], "x": 9, "y": 1},
67 {"label":"Shift", "x":11.5, "y":2, "w":1.75}, 54 {"matrix": [1, 9], "x": 10, "y": 1},
68 {"label":"Up", "x":13.25, "y":2}, 55 {"matrix": [1, 10], "x": 11, "y": 1},
69 {"label":"?", "x":14.25, "y":2}, 56 {"matrix": [1, 11], "x": 12, "y": 1},
70 57 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
71 {"label":"F4", "x":0, "y":3}, 58
72 {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, 59 {"matrix": [2, 0], "x": 0, "y": 2},
73 {"label":"Win", "x":2.5, "y":3}, 60
74 {"label":"Alt", "x":3.5, "y":3, "w":1.25}, 61 {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
75 {"label":"Spacebar", "x":4.75, "y":3, "w":2.25}, 62 {"matrix": [2, 2], "x": 3.5, "y": 2},
76 {"label":"Spacebar", "x":7, "y":3, "w":1.25}, 63 {"matrix": [2, 3], "x": 4.5, "y": 2},
77 {"label":"Spacebar", "x":8.25, "y":3, "w":2.75}, 64 {"matrix": [2, 4], "x": 5.5, "y": 2},
78 {"label":"Alt", "x":11, "y":3, "w":1.25}, 65 {"matrix": [2, 5], "x": 6.5, "y": 2},
79 {"label":"Left", "x":12.25, "y":3}, 66 {"matrix": [2, 6], "x": 7.5, "y": 2},
80 {"label":"Down", "x":13.25, "y":3}, 67 {"matrix": [2, 7], "x": 8.5, "y": 2},
81 {"label":"Right", "x":14.25, "y":3} 68 {"matrix": [2, 8], "x": 9.5, "y": 2},
69 {"matrix": [2, 9], "x": 10.5, "y": 2},
70 {"matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
71 {"matrix": [2, 12], "x": 13.25, "y": 2},
72 {"matrix": [2, 13], "x": 14.25, "y": 2},
73
74 {"matrix": [3, 0], "x": 0, "y": 3},
75
76 {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
77 {"matrix": [3, 2], "x": 2.5, "y": 3},
78 {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
79 {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2.25},
80 {"matrix": [3, 6], "x": 7, "y": 3, "w": 1.25},
81 {"matrix": [3, 7], "x": 8.25, "y": 3, "w": 2.75},
82 {"matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
83 {"matrix": [3, 11], "x": 12.25, "y": 3},
84 {"matrix": [3, 12], "x": 13.25, "y": 3},
85 {"matrix": [3, 13], "x": 14.25, "y": 3}
82 ] 86 ]
83 } 87 }
84 } 88 }
diff --git a/keyboards/adpenrose/obi/obi.h b/keyboards/adpenrose/obi/obi.h
deleted file mode 100644
index 09bf9b29fc..0000000000
--- a/keyboards/adpenrose/obi/obi.h
+++ /dev/null
@@ -1,26 +0,0 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16#define LAYOUT_all( \
17 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
18 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \
19 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, \
20 K30, K31, K32, K33, K35, K36, K37, K3A, K3B, K3C, K3D \
21) { \
22 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
23 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D }, \
24 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_NO, K2C, K2D }, \
25 { K30, K31, K32, K33, KC_NO, K35, K36, K37, KC_NO, KC_NO, K3A, K3B, K3C, K3D } \
26}
diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json
index 9223f5a101..8105d338db 100644
--- a/keyboards/adpenrose/shisaku/info.json
+++ b/keyboards/adpenrose/shisaku/info.json
@@ -18,7 +18,60 @@
18 "layouts": { 18 "layouts": {
19 "LAYOUT_all": { 19 "LAYOUT_all": {
20 "layout": [ 20 "layout": [
21 {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"Backspace", "x":12.75, "y":0, "w":1.5}, {"label":"Caps Lock", "x":0.5, "y":1, "w":1.75}, {"label":"A", "x":2.25, "y":1}, {"label":"S", "x":3.25, "y":1}, {"label":"D", "x":4.25, "y":1}, {"label":"F", "x":5.25, "y":1}, {"label":"G", "x":6.25, "y":1}, {"label":"H", "x":7.75, "y":1}, {"label":"J", "x":8.75, "y":1}, {"label":"K", "x":9.75, "y":1}, {"label":"L", "x":10.75, "y":1}, {"label":":", "x":11.75, "y":1}, {"label":"Enter", "x":12.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.25}, {"label":"Fn", "x":1.25, "y":2}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"B", "x":7.75, "y":2}, {"label":"N", "x":8.75, "y":2}, {"label":"M", "x":9.75, "y":2}, {"label":"<", "x":10.75, "y":2}, {"label":">", "x":11.75, "y":2}, {"label":"Up", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.5}, {"label":"Win", "x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"label":"Alt", "x":6.25, "y":3}, {"x":7.75, "y":3, "w":2.75}, {"label":"Left", "x":11.75, "y":3}, {"label":"Down", "x":12.75, "y":3}, {"label":"Right", "x":13.75, "y":3} 21 {"matrix": [0, 0], "x": 1.25, "y": 0},
22 {"matrix": [0, 1], "x": 2.25, "y": 0},
23 {"matrix": [0, 2], "x": 3.25, "y": 0},
24 {"matrix": [0, 3], "x": 4.25, "y": 0},
25 {"matrix": [0, 4], "x": 5.25, "y": 0},
26 {"matrix": [0, 5], "x": 6.25, "y": 0},
27
28 {"matrix": [0, 6], "x": 7.75, "y": 0},
29 {"matrix": [1, 0], "x": 8.75, "y": 0},
30 {"matrix": [1, 1], "x": 9.75, "y": 0},
31 {"matrix": [1, 2], "x": 10.75, "y": 0},
32 {"matrix": [1, 3], "x": 11.75, "y": 0},
33 {"matrix": [1, 4], "x": 12.75, "y": 0, "w": 1.5},
34
35 {"matrix": [1, 5], "x": 0.5, "y": 1, "w": 1.75},
36 {"matrix": [1, 6], "x": 2.25, "y": 1},
37 {"matrix": [2, 0], "x": 3.25, "y": 1},
38 {"matrix": [2, 1], "x": 4.25, "y": 1},
39 {"matrix": [2, 2], "x": 5.25, "y": 1},
40 {"matrix": [2, 3], "x": 6.25, "y": 1},
41
42 {"matrix": [2, 4], "x": 7.75, "y": 1},
43 {"matrix": [2, 5], "x": 8.75, "y": 1},
44 {"matrix": [2, 6], "x": 9.75, "y": 1},
45 {"matrix": [3, 0], "x": 10.75, "y": 1},
46 {"matrix": [3, 3], "x": 11.75, "y": 1},
47 {"matrix": [3, 4], "x": 12.75, "y": 1, "w": 1.75},
48
49 {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.25},
50 {"matrix": [4, 0], "x": 1.25, "y": 2},
51 {"matrix": [4, 1], "x": 2.25, "y": 2},
52 {"matrix": [4, 2], "x": 3.25, "y": 2},
53 {"matrix": [4, 3], "x": 4.25, "y": 2},
54 {"matrix": [4, 4], "x": 5.25, "y": 2},
55 {"matrix": [4, 5], "x": 6.25, "y": 2},
56
57 {"matrix": [5, 0], "x": 7.75, "y": 2},
58 {"matrix": [5, 1], "x": 8.75, "y": 2},
59 {"matrix": [5, 2], "x": 9.75, "y": 2},
60 {"matrix": [5, 3], "x": 10.75, "y": 2},
61 {"matrix": [5, 4], "x": 11.75, "y": 2},
62 {"matrix": [5, 5], "x": 12.75, "y": 2},
63 {"matrix": [6, 0], "x": 13.75, "y": 2, "w": 1.25},
64
65 {"matrix": [6, 1], "x": 0, "y": 3, "w": 1.5},
66 {"matrix": [6, 2], "x": 3, "y": 3},
67 {"matrix": [6, 3], "x": 4, "y": 3, "w": 2.25},
68 {"matrix": [6, 4], "x": 6.25, "y": 3},
69
70 {"matrix": [6, 5], "x": 7.75, "y": 3, "w": 2.75},
71
72 {"matrix": [7, 0], "x": 11.75, "y": 3},
73 {"matrix": [7, 4], "x": 12.75, "y": 3},
74 {"matrix": [7, 5], "x": 13.75, "y": 3}
22 ] 75 ]
23 } 76 }
24 } 77 }
diff --git a/keyboards/adpenrose/shisaku/shisaku.h b/keyboards/adpenrose/shisaku/shisaku.h
deleted file mode 100644
index ea92202435..0000000000
--- a/keyboards/adpenrose/shisaku/shisaku.h
+++ /dev/null
@@ -1,32 +0,0 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16#define XXX KC_NO
17
18#define LAYOUT_all( \
19 k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, k13, k14, \
20 k15, k16, k20, k21, k22, k23, k24, k25, k26, k30, k33, k34, \
21 k35, k40, k41, k42, k43, k44, k45, k50, k51, k52, k53, k54, k55, k60, \
22 k61, k62, k63, k64, k65, k70, k74, k75 \
23) { \
24 { k00, k01, k02, k03, k04, k05, k06 }, \
25 { k10, k11, k12, k13, k14, k15, k16 }, \
26 { k20, k21, k22, k23, k24, k25, k26 }, \
27 { k30, XXX, XXX, k33, k34, k35, XXX }, \
28 { k40, k41, k42, k43, k44, k45, XXX }, \
29 { k50, k51, k52, k53, k54, k55, XXX }, \
30 { k60, k61, k62, k63, k64, k65, XXX }, \
31 { k70, XXX, XXX, XXX, k74, k75, XXX } \
32}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:42:05 +0000