summaryrefslogtreecommitdiff
path: root/keyboards/program_yoink
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-29 15:54:34 +1100
committerGitHub <noreply@github.com>2023-03-29 15:54:34 +1100
commit4869b8061c187f6476f8f14b839dd2c2c9f74dd2 (patch)
tree085ba6c614b0cc649a664b6e9e8829ee6f1fe593 /keyboards/program_yoink
parent06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff)
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/program_yoink')
-rw-r--r--keyboards/program_yoink/ortho/info.json190
-rw-r--r--keyboards/program_yoink/ortho/ortho.h55
2 files changed, 95 insertions, 150 deletions
diff --git a/keyboards/program_yoink/ortho/info.json b/keyboards/program_yoink/ortho/info.json
index 6f2162b206..cd43c3f92a 100644
--- a/keyboards/program_yoink/ortho/info.json
+++ b/keyboards/program_yoink/ortho/info.json
@@ -23,111 +23,111 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT_ortho": { 24 "LAYOUT_ortho": {
25 "layout": [ 25 "layout": [
26 {"x":0, "y":0}, 26 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"x":1, "y":0}, 27 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"x":2, "y":0}, 28 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"x":3, "y":0}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"x":4, "y":0}, 30 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"x":5, "y":0}, 31 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"x":6, "y":0}, 32 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"x":7, "y":0}, 33 {"matrix": [0, 7], "x": 7, "y": 0},
34 {"x":8, "y":0}, 34 {"matrix": [0, 8], "x": 8, "y": 0},
35 {"x":9, "y":0}, 35 {"matrix": [0, 9], "x": 9, "y": 0},
36 {"x":10, "y":0}, 36 {"matrix": [0, 10], "x": 10, "y": 0},
37 {"x":11, "y":0}, 37 {"matrix": [0, 11], "x": 11, "y": 0},
38 {"x":12.5, "y":0}, 38 {"matrix": [0, 12], "x": 12.5, "y": 0},
39 39
40 {"x":0, "y":1}, 40 {"matrix": [1, 0], "x": 0, "y": 1},
41 {"x":1, "y":1}, 41 {"matrix": [1, 1], "x": 1, "y": 1},
42 {"x":2, "y":1}, 42 {"matrix": [1, 2], "x": 2, "y": 1},
43 {"x":3, "y":1}, 43 {"matrix": [1, 3], "x": 3, "y": 1},
44 {"x":4, "y":1}, 44 {"matrix": [1, 4], "x": 4, "y": 1},
45 {"x":5, "y":1}, 45 {"matrix": [1, 5], "x": 5, "y": 1},
46 {"x":6, "y":1}, 46 {"matrix": [1, 6], "x": 6, "y": 1},
47 {"x":7, "y":1}, 47 {"matrix": [1, 7], "x": 7, "y": 1},
48 {"x":8, "y":1}, 48 {"matrix": [1, 8], "x": 8, "y": 1},
49 {"x":9, "y":1}, 49 {"matrix": [1, 9], "x": 9, "y": 1},
50 {"x":10, "y":1}, 50 {"matrix": [1, 10], "x": 10, "y": 1},
51 {"x":11, "y":1}, 51 {"matrix": [1, 11], "x": 11, "y": 1},
52 {"x":12.5, "y":1}, 52 {"matrix": [1, 12], "x": 12.5, "y": 1},
53 53
54 {"x":0, "y":2}, 54 {"matrix": [2, 0], "x": 0, "y": 2},
55 {"x":1, "y":2}, 55 {"matrix": [2, 1], "x": 1, "y": 2},
56 {"x":2, "y":2}, 56 {"matrix": [2, 2], "x": 2, "y": 2},
57 {"x":3, "y":2}, 57 {"matrix": [2, 3], "x": 3, "y": 2},
58 {"x":4, "y":2}, 58 {"matrix": [2, 4], "x": 4, "y": 2},
59 {"x":5, "y":2}, 59 {"matrix": [2, 5], "x": 5, "y": 2},
60 {"x":6, "y":2}, 60 {"matrix": [2, 6], "x": 6, "y": 2},
61 {"x":7, "y":2}, 61 {"matrix": [2, 7], "x": 7, "y": 2},
62 {"x":8, "y":2}, 62 {"matrix": [2, 8], "x": 8, "y": 2},
63 {"x":9, "y":2}, 63 {"matrix": [2, 9], "x": 9, "y": 2},
64 {"x":10, "y":2}, 64 {"matrix": [2, 10], "x": 10, "y": 2},
65 {"x":11.25, "y":2.25}, 65 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
66 {"x":12.5, "y":2}, 66 {"matrix": [2, 12], "x": 12.5, "y": 2},
67 67
68 {"x":0, "y":3}, 68 {"matrix": [3, 0], "x": 0, "y": 3},
69 {"x":1, "y":3}, 69 {"matrix": [3, 1], "x": 1, "y": 3},
70 {"x":2, "y":3, "w":7}, 70 {"matrix": [3, 5], "x": 2, "y": 3, "w": 7},
71 {"x":9, "y":3}, 71 {"matrix": [3, 9], "x": 9, "y": 3},
72 {"x":10.25, "y":3.25}, 72 {"matrix": [3, 10], "x": 10.25, "y": 3.25},
73 {"x":11.25, "y":3.25}, 73 {"matrix": [3, 11], "x": 11.25, "y": 3.25},
74 {"x":12.25, "y":3.25} 74 {"matrix": [3, 12], "x": 12.25, "y": 3.25}
75 ] 75 ]
76 }, 76 },
77 "LAYOUT_ortho_split": { 77 "LAYOUT_ortho_split": {
78 "layout": [ 78 "layout": [
79 {"x":0, "y":0}, 79 {"matrix": [0, 0], "x": 0, "y": 0},
80 {"x":1, "y":0}, 80 {"matrix": [0, 1], "x": 1, "y": 0},
81 {"x":2, "y":0}, 81 {"matrix": [0, 2], "x": 2, "y": 0},
82 {"x":3, "y":0}, 82 {"matrix": [0, 3], "x": 3, "y": 0},
83 {"x":4, "y":0}, 83 {"matrix": [0, 4], "x": 4, "y": 0},
84 {"x":5, "y":0}, 84 {"matrix": [0, 5], "x": 5, "y": 0},
85 {"x":6, "y":0}, 85 {"matrix": [0, 6], "x": 6, "y": 0},
86 {"x":7, "y":0}, 86 {"matrix": [0, 7], "x": 7, "y": 0},
87 {"x":8, "y":0}, 87 {"matrix": [0, 8], "x": 8, "y": 0},
88 {"x":9, "y":0}, 88 {"matrix": [0, 9], "x": 9, "y": 0},
89 {"x":10, "y":0}, 89 {"matrix": [0, 10], "x": 10, "y": 0},
90 {"x":11, "y":0}, 90 {"matrix": [0, 11], "x": 11, "y": 0},
91 {"x":12.5, "y":0}, 91 {"matrix": [0, 12], "x": 12.5, "y": 0},
92 92
93 {"x":0, "y":1}, 93 {"matrix": [1, 0], "x": 0, "y": 1},
94 {"x":1, "y":1}, 94 {"matrix": [1, 1], "x": 1, "y": 1},
95 {"x":2, "y":1}, 95 {"matrix": [1, 2], "x": 2, "y": 1},
96 {"x":3, "y":1}, 96 {"matrix": [1, 3], "x": 3, "y": 1},
97 {"x":4, "y":1}, 97 {"matrix": [1, 4], "x": 4, "y": 1},
98 {"x":5, "y":1}, 98 {"matrix": [1, 5], "x": 5, "y": 1},
99 {"x":6, "y":1}, 99 {"matrix": [1, 6], "x": 6, "y": 1},
100 {"x":7, "y":1}, 100 {"matrix": [1, 7], "x": 7, "y": 1},
101 {"x":8, "y":1}, 101 {"matrix": [1, 8], "x": 8, "y": 1},
102 {"x":9, "y":1}, 102 {"matrix": [1, 9], "x": 9, "y": 1},
103 {"x":10, "y":1}, 103 {"matrix": [1, 10], "x": 10, "y": 1},
104 {"x":11, "y":1}, 104 {"matrix": [1, 11], "x": 11, "y": 1},
105 {"x":12.5, "y":1}, 105 {"matrix": [1, 12], "x": 12.5, "y": 1},
106 106
107 {"x":0, "y":2}, 107 {"matrix": [2, 0], "x": 0, "y": 2},
108 {"x":1, "y":2}, 108 {"matrix": [2, 1], "x": 1, "y": 2},
109 {"x":2, "y":2}, 109 {"matrix": [2, 2], "x": 2, "y": 2},
110 {"x":3, "y":2}, 110 {"matrix": [2, 3], "x": 3, "y": 2},
111 {"x":4, "y":2}, 111 {"matrix": [2, 4], "x": 4, "y": 2},
112 {"x":5, "y":2}, 112 {"matrix": [2, 5], "x": 5, "y": 2},
113 {"x":6, "y":2}, 113 {"matrix": [2, 6], "x": 6, "y": 2},
114 {"x":7, "y":2}, 114 {"matrix": [2, 7], "x": 7, "y": 2},
115 {"x":8, "y":2}, 115 {"matrix": [2, 8], "x": 8, "y": 2},
116 {"x":9, "y":2}, 116 {"matrix": [2, 9], "x": 9, "y": 2},
117 {"x":10, "y":2}, 117 {"matrix": [2, 10], "x": 10, "y": 2},
118 {"x":11.25, "y":2.25}, 118 {"matrix": [2, 11], "x": 11.25, "y": 2.25},
119 {"x":12.5, "y":2}, 119 {"matrix": [2, 12], "x": 12.5, "y": 2},
120 120
121 {"x":0, "y":3}, 121 {"matrix": [3, 0], "x": 0, "y": 3},
122 {"x":1, "y":3}, 122 {"matrix": [3, 1], "x": 1, "y": 3},
123 {"x":2, "y":3}, 123 {"matrix": [3, 2], "x": 2, "y": 3},
124 {"x":3, "y":3, "w":2.75}, 124 {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.75},
125 {"x":5.75, "y":3, "w":2.25}, 125 {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.25},
126 {"x":8, "y":3}, 126 {"matrix": [3, 8], "x": 8, "y": 3},
127 {"x":9, "y":3}, 127 {"matrix": [3, 9], "x": 9, "y": 3},
128 {"x":10.25, "y":3.25}, 128 {"matrix": [3, 10], "x": 10.25, "y": 3.25},
129 {"x":11.25, "y":3.25}, 129 {"matrix": [3, 11], "x": 11.25, "y": 3.25},
130 {"x":12.25, "y":3.25} 130 {"matrix": [3, 12], "x": 12.25, "y": 3.25}
131 ] 131 ]
132 } 132 }
133 } 133 }
diff --git a/keyboards/program_yoink/ortho/ortho.h b/keyboards/program_yoink/ortho/ortho.h
deleted file mode 100644
index e847f16edc..0000000000
--- a/keyboards/program_yoink/ortho/ortho.h
+++ /dev/null
@@ -1,55 +0,0 @@
1/* Copyright 2020 melonbred
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 XXX KC_NO
30
31#define LAYOUT_ortho( \
32 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
33 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
34 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
35 K30, K31, K35, K39, K3A, K3B, K3C \
36) \
37{ \
38 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
39 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
40 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
41 { K30, K31, XXX, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B, K3C } \
42}
43
44#define LAYOUT_ortho_split( \
45 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
46 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
47 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
48 K30, K31, K32, K34, K37, K38, K39, K3A, K3B, K3C \
49) \
50{ \
51 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
52 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
53 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
54 { K30, K31, K32, XXX, K34, XXX, XXX, K37, K38, K39, K3A, K3B, K3C } \
55}