aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-19 17:13:31 +0000
committerGitHub <noreply@github.com>2021-08-19 10:13:31 -0700
commit48a8682438d5708636c3260adfb6a75ac89ed05a (patch)
tree15d290871651e0e6eaa455140b5490688aae8471
parentc1484761889cee72e6695dea1bce0c70795f1ca1 (diff)
downloadqmk_firmware-48a8682438d5708636c3260adfb6a75ac89ed05a.tar.gz
qmk_firmware-48a8682438d5708636c3260adfb6a75ac89ed05a.zip
Linworks Whale75 Layout Macro refactor and Configurator fixes (#14059)
* info.json: human-friendly formatting * info.json: remove "w":1 instances * info.json: correct positions of Left, Down and Right Arrow keys * info.json: add LAYOUT_all data * move Home key to end of home row According to photographs of the keyboard, the fourth key down on the right side is physically on the home row. This commit moves the key argument and keycodes to the home row. * whale75.h: use QMK 3-character notation for matrix * whale75.h: add matrix diagram * add keyboard-level encoder functionality * info.json: correct key sequence on ISO layouts
-rw-r--r--keyboards/linworks/whale75/info.json804
-rw-r--r--keyboards/linworks/whale75/keymaps/default/keymap.c8
-rw-r--r--keyboards/linworks/whale75/keymaps/via/keymap.c16
-rw-r--r--keyboards/linworks/whale75/whale75.c26
-rw-r--r--keyboards/linworks/whale75/whale75.h143
5 files changed, 569 insertions, 428 deletions
diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json
index 7518afb9d..89fd24b39 100644
--- a/keyboards/linworks/whale75/info.json
+++ b/keyboards/linworks/whale75/info.json
@@ -1,364 +1,456 @@
1{ 1{
2 "keyboard_name": "Lx3 Whale 75", 2 "keyboard_name": "Lx3 Whale 75",
3 "maintainer": "ebastler", 3 "maintainer": "ebastler",
4 "width": 16.25, 4 "width": 16.25,
5 "height": 6.5, 5 "height": 6.5,
6 "layouts": { 6 "layouts": {
7 "LAYOUT_ansi": { 7 "LAYOUT_all": {
8 "layout": [ 8 "layout": [
9 { "x": 0, "y": 0 }, 9 {"x":0, "y":0},
10 { "x": 2, "y": 0 }, 10 {"x":2, "y":0},
11 { "x": 3, "y": 0 }, 11 {"x":3, "y":0},
12 { "x": 4, "y": 0 }, 12 {"x":4, "y":0},
13 { "x": 5, "y": 0 }, 13 {"x":5, "y":0},
14 { "x": 6.5, "y": 0 }, 14 {"x":6.5, "y":0},
15 { "x": 7.5, "y": 0 }, 15 {"x":7.5, "y":0},
16 { "x": 8.5, "y": 0 }, 16 {"x":8.5, "y":0},
17 { "x": 9.5, "y": 0 }, 17 {"x":9.5, "y":0},
18 { "x": 11, "y": 0 }, 18 {"x":11, "y":0},
19 { "x": 12, "y": 0 }, 19 {"x":12, "y":0},
20 { "x": 13, "y": 0 }, 20 {"x":13, "y":0},
21 { "x": 14, "y": 0 }, 21 {"x":14, "y":0},
22 { "x": 15.25, "y": 0 }, 22 {"x":15.25, "y":0},
23 23
24 { "x": 0, "y": 1.25 }, 24 {"x":0, "y":1.25},
25 { "x": 1, "y": 1.25 }, 25 {"x":1, "y":1.25},
26 { "x": 2, "y": 1.25 }, 26 {"x":2, "y":1.25},
27 { "x": 3, "y": 1.25 }, 27 {"x":3, "y":1.25},
28 { "x": 4, "y": 1.25 }, 28 {"x":4, "y":1.25},
29 { "x": 5, "y": 1.25 }, 29 {"x":5, "y":1.25},
30 { "x": 6, "y": 1.25 }, 30 {"x":6, "y":1.25},
31 { "x": 7, "y": 1.25 }, 31 {"x":7, "y":1.25},
32 { "x": 8, "y": 1.25 }, 32 {"x":8, "y":1.25},
33 { "x": 9, "y": 1.25 }, 33 {"x":9, "y":1.25},
34 { "x": 10, "y": 1.25 }, 34 {"x":10, "y":1.25},
35 { "x": 11, "y": 1.25 }, 35 {"x":11, "y":1.25},
36 { "x": 12, "y": 1.25 }, 36 {"x":12, "y":1.25},
37 { "x": 13, "y": 1.25, "w":2}, 37 {"x":13, "y":1.25},
38 { "x": 15.25, "y": 1.25 }, 38 {"x":14, "y":1.25},
39 {"x":15.25, "y":1.25},
39 40
40 { "x": 0, "y": 2.25, "w": 1.5 }, 41 {"x":0, "y":2.25, "w":1.5},
41 { "x": 1.5, "y": 2.25 }, 42 {"x":1.5, "y":2.25},
42 { "x": 2.5, "y": 2.25 }, 43 {"x":2.5, "y":2.25},
43 { "x": 3.5, "y": 2.25 }, 44 {"x":3.5, "y":2.25},
44 { "x": 4.5, "y": 2.25 }, 45 {"x":4.5, "y":2.25},
45 { "x": 5.5, "y": 2.25 }, 46 {"x":5.5, "y":2.25},
46 { "x": 6.5, "y": 2.25 }, 47 {"x":6.5, "y":2.25},
47 { "x": 7.5, "y": 2.25 }, 48 {"x":7.5, "y":2.25},
48 { "x": 8.5, "y": 2.25 }, 49 {"x":8.5, "y":2.25},
49 { "x": 9.5, "y": 2.25 }, 50 {"x":9.5, "y":2.25},
50 { "x": 10.5, "y": 2.25 }, 51 {"x":10.5, "y":2.25},
51 { "x": 11.5, "y": 2.25 }, 52 {"x":11.5, "y":2.25},
52 { "x": 12.5, "y": 2.25 }, 53 {"x":12.5, "y":2.25},
53 { "x": 13.5, "y": 2.25, "w":1.5 }, 54 {"x":13.5, "y":2.25, "w":1.5},
54 { "x": 15.25, "y": 2.25 }, 55 {"x":15.25, "y":2.25},
55 56
56 { "x": 0, "y": 3.25, "w": 1.75 }, 57 {"x":0, "y":3.25, "w":1.75},
57 { "x": 1.75, "y": 3.25 }, 58 {"x":1.75, "y":3.25},
58 { "x": 2.75, "y": 3.25 }, 59 {"x":2.75, "y":3.25},
59 { "x": 3.75, "y": 3.25 }, 60 {"x":3.75, "y":3.25},
60 { "x": 4.75, "y": 3.25 }, 61 {"x":4.75, "y":3.25},
61 { "x": 5.75, "y": 3.25 }, 62 {"x":5.75, "y":3.25},
62 { "x": 6.75, "y": 3.25 }, 63 {"x":6.75, "y":3.25},
63 { "x": 7.75, "y": 3.25 }, 64 {"x":7.75, "y":3.25},
64 { "x": 8.75, "y": 3.25 }, 65 {"x":8.75, "y":3.25},
65 { "x": 9.75, "y": 3.25 }, 66 {"x":9.75, "y":3.25},
66 { "x": 10.75, "y": 3.25 }, 67 {"x":10.75, "y":3.25},
67 { "x": 11.75, "y": 3.25 }, 68 {"x":11.75, "y":3.25},
68 { "x": 12.75, "y": 3.25, "w":2.25 }, 69 {"x":12.75, "y":3.25},
69 { "x": 15.25, "y": 3.25 }, 70 {"x":13.75, "y":3.25, "w":1.25},
71 {"x":15.25, "y":3.25},
70 72
71 { "x": 0, "y": 4.25, "w": 2.25 }, 73 {"x":0, "y":4.25, "w":1.25},
72 { "x": 2.25, "y": 4.25 }, 74 {"x":1.25, "y":4.25},
73 { "x": 3.25, "y": 4.25 }, 75 {"x":2.25, "y":4.25},
74 { "x": 4.25, "y": 4.25 }, 76 {"x":3.25, "y":4.25},
75 { "x": 5.25, "y": 4.25 }, 77 {"x":4.25, "y":4.25},
76 { "x": 6.25, "y": 4.25 }, 78 {"x":5.25, "y":4.25},
77 { "x": 7.25, "y": 4.25 }, 79 {"x":6.25, "y":4.25},
78 { "x": 8.25, "y": 4.25 }, 80 {"x":7.25, "y":4.25},
79 { "x": 9.25, "y": 4.25 }, 81 {"x":8.25, "y":4.25},
80 { "x": 10.25, "y": 4.25 }, 82 {"x":9.25, "y":4.25},
81 { "x": 11.25, "y": 4.25 }, 83 {"x":10.25, "y":4.25},
82 { "x": 12.25, "y": 4.25, "w":1.75 }, 84 {"x":11.25, "y":4.25},
83 { "x": 14.25, "y": 4.5 }, 85 {"x":12.25, "y":4.25, "w":1.75},
86 {"x":14.25, "y":4.5},
84 87
85 { "x": 0, "y": 5.25, "w": 1.25}, 88 {"x":0, "y":5.25, "w":1.25},
86 { "x": 1.25, "y": 5.25, "w": 1.25}, 89 {"x":1.25, "y":5.25, "w":1.25},
87 { "x": 2.5, "y": 5.25, "w": 1.25}, 90 {"x":2.5, "y":5.25, "w":1.25},
88 { "x": 3.75, "y": 5.25, "w": 6.25}, 91 {"x":3.75, "y":5.25, "w":6.25},
89 { "x": 10, "y": 5.25, "w": 1.5}, 92 {"x":10, "y":5.25, "w":1.5},
90 { "x": 11.5, "y": 5.25, "w": 1.5}, 93 {"x":11.5, "y":5.25, "w":1.5},
91 { "x": 13.25, "y": 5.25, "w": 1}, 94 {"x":13.25, "y":5.5},
92 { "x": 14.25, "y": 5.25, "w": 1}, 95 {"x":14.25, "y":5.5},
93 { "x": 15.25, "y": 5.25, "w": 1} 96 {"x":15.25, "y":5.5}
94 ] 97 ]
95 }, 98 },
96 "LAYOUT_ansi_wkl": { 99 "LAYOUT_ansi": {
97 "layout": [ 100 "layout": [
98 { "x": 0, "y": 0 }, 101 {"x":0, "y":0},
99 { "x": 2, "y": 0 }, 102 {"x":2, "y":0},
100 { "x": 3, "y": 0 }, 103 {"x":3, "y":0},
101 { "x": 4, "y": 0 }, 104 {"x":4, "y":0},
102 { "x": 5, "y": 0 }, 105 {"x":5, "y":0},
103 { "x": 6.5, "y": 0 }, 106 {"x":6.5, "y":0},
104 { "x": 7.5, "y": 0 }, 107 {"x":7.5, "y":0},
105 { "x": 8.5, "y": 0 }, 108 {"x":8.5, "y":0},
106 { "x": 9.5, "y": 0 }, 109 {"x":9.5, "y":0},
107 { "x": 11, "y": 0 }, 110 {"x":11, "y":0},
108 { "x": 12, "y": 0 }, 111 {"x":12, "y":0},
109 { "x": 13, "y": 0 }, 112 {"x":13, "y":0},
110 { "x": 14, "y": 0 }, 113 {"x":14, "y":0},
111 { "x": 15.25, "y": 0 }, 114 {"x":15.25, "y":0},
112 115
113 { "x": 0, "y": 1.25 }, 116 {"x":0, "y":1.25},
114 { "x": 1, "y": 1.25 }, 117 {"x":1, "y":1.25},
115 { "x": 2, "y": 1.25 }, 118 {"x":2, "y":1.25},
116 { "x": 3, "y": 1.25 }, 119 {"x":3, "y":1.25},
117 { "x": 4, "y": 1.25 }, 120 {"x":4, "y":1.25},
118 { "x": 5, "y": 1.25 }, 121 {"x":5, "y":1.25},
119 { "x": 6, "y": 1.25 }, 122 {"x":6, "y":1.25},
120 { "x": 7, "y": 1.25 }, 123 {"x":7, "y":1.25},
121 { "x": 8, "y": 1.25 }, 124 {"x":8, "y":1.25},
122 { "x": 9, "y": 1.25 }, 125 {"x":9, "y":1.25},
123 { "x": 10, "y": 1.25 }, 126 {"x":10, "y":1.25},
124 { "x": 11, "y": 1.25 }, 127 {"x":11, "y":1.25},
125 { "x": 12, "y": 1.25 }, 128 {"x":12, "y":1.25},
126 { "x": 13, "y": 1.25, "w":2}, 129 {"x":13, "y":1.25, "w":2},
127 { "x": 15.25, "y": 1.25 }, 130 {"x":15.25, "y":1.25},
128 131
129 { "x": 0, "y": 2.25, "w": 1.5 }, 132 {"x":0, "y":2.25, "w":1.5},
130 { "x": 1.5, "y": 2.25 }, 133 {"x":1.5, "y":2.25},
131 { "x": 2.5, "y": 2.25 }, 134 {"x":2.5, "y":2.25},
132 { "x": 3.5, "y": 2.25 }, 135 {"x":3.5, "y":2.25},
133 { "x": 4.5, "y": 2.25 }, 136 {"x":4.5, "y":2.25},
134 { "x": 5.5, "y": 2.25 }, 137 {"x":5.5, "y":2.25},
135 { "x": 6.5, "y": 2.25 }, 138 {"x":6.5, "y":2.25},
136 { "x": 7.5, "y": 2.25 }, 139 {"x":7.5, "y":2.25},
137 { "x": 8.5, "y": 2.25 }, 140 {"x":8.5, "y":2.25},
138 { "x": 9.5, "y": 2.25 }, 141 {"x":9.5, "y":2.25},
139 { "x": 10.5, "y": 2.25 }, 142 {"x":10.5, "y":2.25},
140 { "x": 11.5, "y": 2.25 }, 143 {"x":11.5, "y":2.25},
141 { "x": 12.5, "y": 2.25 }, 144 {"x":12.5, "y":2.25},
142 { "x": 13.5, "y": 2.25, "w":1.5 }, 145 {"x":13.5, "y":2.25, "w":1.5},
143 { "x": 15.25, "y": 2.25 }, 146 {"x":15.25, "y":2.25},
144 147
145 { "x": 0, "y": 3.25, "w": 1.75 }, 148 {"x":0, "y":3.25, "w":1.75},
146 { "x": 1.75, "y": 3.25 }, 149 {"x":1.75, "y":3.25},
147 { "x": 2.75, "y": 3.25 }, 150 {"x":2.75, "y":3.25},
148 { "x": 3.75, "y": 3.25 }, 151 {"x":3.75, "y":3.25},
149 { "x": 4.75, "y": 3.25 }, 152 {"x":4.75, "y":3.25},
150 { "x": 5.75, "y": 3.25 }, 153 {"x":5.75, "y":3.25},
151 { "x": 6.75, "y": 3.25 }, 154 {"x":6.75, "y":3.25},
152 { "x": 7.75, "y": 3.25 }, 155 {"x":7.75, "y":3.25},
153 { "x": 8.75, "y": 3.25 }, 156 {"x":8.75, "y":3.25},
154 { "x": 9.75, "y": 3.25 }, 157 {"x":9.75, "y":3.25},
155 { "x": 10.75, "y": 3.25 }, 158 {"x":10.75, "y":3.25},
156 { "x": 11.75, "y": 3.25 }, 159 {"x":11.75, "y":3.25},
157 { "x": 12.75, "y": 3.25, "w":2.25 }, 160 {"x":12.75, "y":3.25, "w":2.25},
158 { "x": 15.25, "y": 3.25 }, 161 {"x":15.25, "y":3.25},
159 162
160 { "x": 0, "y": 4.25, "w": 2.25 }, 163 {"x":0, "y":4.25, "w":2.25},
161 { "x": 2.25, "y": 4.25 }, 164 {"x":2.25, "y":4.25},
162 { "x": 3.25, "y": 4.25 }, 165 {"x":3.25, "y":4.25},
163 { "x": 4.25, "y": 4.25 }, 166 {"x":4.25, "y":4.25},
164 { "x": 5.25, "y": 4.25 }, 167 {"x":5.25, "y":4.25},
165 { "x": 6.25, "y": 4.25 }, 168 {"x":6.25, "y":4.25},
166 { "x": 7.25, "y": 4.25 }, 169 {"x":7.25, "y":4.25},
167 { "x": 8.25, "y": 4.25 }, 170 {"x":8.25, "y":4.25},
168 { "x": 9.25, "y": 4.25 }, 171 {"x":9.25, "y":4.25},
169 { "x": 10.25, "y": 4.25 }, 172 {"x":10.25, "y":4.25},
170 { "x": 11.25, "y": 4.25 }, 173 {"x":11.25, "y":4.25},
171 { "x": 12.25, "y": 4.25, "w":1.75 }, 174 {"x":12.25, "y":4.25, "w":1.75},
172 { "x": 14.25, "y": 4.5 }, 175 {"x":14.25, "y":4.5},
173 176
174 { "x": 0, "y": 5.25, "w": 1.5}, 177 {"x":0, "y":5.25, "w":1.25},
175 { "x": 1.5, "y": 5.25, "w": 1.5}, 178 {"x":1.25, "y":5.25, "w":1.25},
176 { "x": 3, "y": 5.25, "w": 7}, 179 {"x":2.5, "y":5.25, "w":1.25},
177 { "x": 10, "y": 5.25, "w": 1.5}, 180 {"x":3.75, "y":5.25, "w":6.25},
178 { "x": 11.5, "y": 5.25, "w": 1.5}, 181 {"x":10, "y":5.25, "w":1.5},
179 { "x": 13.25, "y": 5.25, "w": 1}, 182 {"x":11.5, "y":5.25, "w":1.5},
180 { "x": 14.25, "y": 5.25, "w": 1}, 183 {"x":13.25, "y":5.5},
181 { "x": 15.25, "y": 5.25, "w": 1} 184 {"x":14.25, "y":5.5},
182 ] 185 {"x":15.25, "y":5.5}
183 }, 186 ]
184 "LAYOUT_iso": { 187 },
185 "layout": [ 188 "LAYOUT_ansi_wkl": {
186 { "x": 0, "y": 0 }, 189 "layout": [
187 { "x": 2, "y": 0 }, 190 {"x":0, "y":0},
188 { "x": 3, "y": 0 }, 191 {"x":2, "y":0},
189 { "x": 4, "y": 0 }, 192 {"x":3, "y":0},
190 { "x": 5, "y": 0 }, 193 {"x":4, "y":0},
191 { "x": 6.5, "y": 0 }, 194 {"x":5, "y":0},
192 { "x": 7.5, "y": 0 }, 195 {"x":6.5, "y":0},
193 { "x": 8.5, "y": 0 }, 196 {"x":7.5, "y":0},
194 { "x": 9.5, "y": 0 }, 197 {"x":8.5, "y":0},
195 { "x": 11, "y": 0 }, 198 {"x":9.5, "y":0},
196 { "x": 12, "y": 0 }, 199 {"x":11, "y":0},
197 { "x": 13, "y": 0 }, 200 {"x":12, "y":0},
198 { "x": 14, "y": 0 }, 201 {"x":13, "y":0},
199 { "x": 15.25, "y": 0 }, 202 {"x":14, "y":0},
200 203 {"x":15.25, "y":0},
201 { "x": 0, "y": 1.25 }, 204
202 { "x": 1, "y": 1.25 }, 205 {"x":0, "y":1.25},
203 { "x": 2, "y": 1.25 }, 206 {"x":1, "y":1.25},
204 { "x": 3, "y": 1.25 }, 207 {"x":2, "y":1.25},
205 { "x": 4, "y": 1.25 }, 208 {"x":3, "y":1.25},
206 { "x": 5, "y": 1.25 }, 209 {"x":4, "y":1.25},
207 { "x": 6, "y": 1.25 }, 210 {"x":5, "y":1.25},
208 { "x": 7, "y": 1.25 }, 211 {"x":6, "y":1.25},
209 { "x": 8, "y": 1.25 }, 212 {"x":7, "y":1.25},
210 { "x": 9, "y": 1.25 }, 213 {"x":8, "y":1.25},
211 { "x": 10, "y": 1.25 }, 214 {"x":9, "y":1.25},
212 { "x": 11, "y": 1.25 }, 215 {"x":10, "y":1.25},
213 { "x": 12, "y": 1.25 }, 216 {"x":11, "y":1.25},
214 { "x": 13, "y": 1.25, "w":2}, 217 {"x":12, "y":1.25},
215 { "x": 15.25, "y": 1.25 }, 218 {"x":13, "y":1.25, "w":2},
216 219 {"x":15.25, "y":1.25},
217 { "x": 0, "y": 2.25, "w": 1.5 }, 220
218 { "x": 1.5, "y": 2.25 }, 221 {"x":0, "y":2.25, "w":1.5},
219 { "x": 2.5, "y": 2.25 }, 222 {"x":1.5, "y":2.25},
220 { "x": 3.5, "y": 2.25 }, 223 {"x":2.5, "y":2.25},
221 { "x": 4.5, "y": 2.25 }, 224 {"x":3.5, "y":2.25},
222 { "x": 5.5, "y": 2.25 }, 225 {"x":4.5, "y":2.25},
223 { "x": 6.5, "y": 2.25 }, 226 {"x":5.5, "y":2.25},
224 { "x": 7.5, "y": 2.25 }, 227 {"x":6.5, "y":2.25},
225 { "x": 8.5, "y": 2.25 }, 228 {"x":7.5, "y":2.25},
226 { "x": 9.5, "y": 2.25 }, 229 {"x":8.5, "y":2.25},
227 { "x": 10.5, "y": 2.25 }, 230 {"x":9.5, "y":2.25},
228 { "x": 11.5, "y": 2.25 }, 231 {"x":10.5, "y":2.25},
229 { "x": 12.5, "y": 2.25 }, 232 {"x":11.5, "y":2.25},
230 { "x": 13.75, "y":2.25, "w":1.25, "h":2 }, 233 {"x":12.5, "y":2.25},
231 { "x": 15.25, "y": 2.25 }, 234 {"x":13.5, "y":2.25, "w":1.5},
232 235 {"x":15.25, "y":2.25},
233 { "x": 0, "y": 3.25, "w": 1.75 }, 236
234 { "x": 1.75, "y": 3.25 }, 237 {"x":0, "y":3.25, "w":1.75},
235 { "x": 2.75, "y": 3.25 }, 238 {"x":1.75, "y":3.25},
236 { "x": 3.75, "y": 3.25 }, 239 {"x":2.75, "y":3.25},
237 { "x": 4.75, "y": 3.25 }, 240 {"x":3.75, "y":3.25},
238 { "x": 5.75, "y": 3.25 }, 241 {"x":4.75, "y":3.25},
239 { "x": 6.75, "y": 3.25 }, 242 {"x":5.75, "y":3.25},
240 { "x": 7.75, "y": 3.25 }, 243 {"x":6.75, "y":3.25},
241 { "x": 8.75, "y": 3.25 }, 244 {"x":7.75, "y":3.25},
242 { "x": 9.75, "y": 3.25 }, 245 {"x":8.75, "y":3.25},
243 { "x": 10.75, "y": 3.25 }, 246 {"x":9.75, "y":3.25},
244 { "x": 11.75, "y": 3.25 }, 247 {"x":10.75, "y":3.25},
245 { "x": 12.75, "y": 3.25 }, 248 {"x":11.75, "y":3.25},
246 { "x": 15.25, "y": 3.25 }, 249 {"x":12.75, "y":3.25, "w":2.25},
247 250 {"x":15.25, "y":3.25},
248 { "x": 0, "y": 4.25, "w": 1.25 }, 251
249 { "x": 1.25, "y": 4.25 }, 252 {"x":0, "y":4.25, "w":2.25},
250 { "x": 2.25, "y": 4.25 }, 253 {"x":2.25, "y":4.25},
251 { "x": 3.25, "y": 4.25 }, 254 {"x":3.25, "y":4.25},
252 { "x": 4.25, "y": 4.25 }, 255 {"x":4.25, "y":4.25},
253 { "x": 5.25, "y": 4.25 }, 256 {"x":5.25, "y":4.25},
254 { "x": 6.25, "y": 4.25 }, 257 {"x":6.25, "y":4.25},
255 { "x": 7.25, "y": 4.25 }, 258 {"x":7.25, "y":4.25},
256 { "x": 8.25, "y": 4.25 }, 259 {"x":8.25, "y":4.25},
257 { "x": 9.25, "y": 4.25 }, 260 {"x":9.25, "y":4.25},
258 { "x": 10.25, "y": 4.25 }, 261 {"x":10.25, "y":4.25},
259 { "x": 11.25, "y": 4.25 }, 262 {"x":11.25, "y":4.25},
260 { "x": 12.25, "y": 4.25, "w":1.75 }, 263 {"x":12.25, "y":4.25, "w":1.75},
261 { "x": 14.25, "y": 4.5 }, 264 {"x":14.25, "y":4.5},
262 265
263 { "x": 0, "y": 5.25, "w": 1.25}, 266 {"x":0, "y":5.25, "w":1.5},
264 { "x": 1.25, "y": 5.25, "w": 1.25}, 267 {"x":1.5, "y":5.25, "w":1.5},
265 { "x": 2.5, "y": 5.25, "w": 1.25}, 268 {"x":3, "y":5.25, "w":7},
266 { "x": 3.75, "y": 5.25, "w": 6.25}, 269 {"x":10, "y":5.25, "w":1.5},
267 { "x": 10, "y": 5.25, "w": 1.5}, 270 {"x":11.5, "y":5.25, "w":1.5},
268 { "x": 11.5, "y": 5.25, "w": 1.5}, 271 {"x":13.25, "y":5.5},
269 { "x": 13.25, "y": 5.25, "w": 1}, 272 {"x":14.25, "y":5.5},
270 { "x": 14.25, "y": 5.25, "w": 1}, 273 {"x":15.25, "y":5.5}
271 { "x": 15.25, "y": 5.25, "w": 1} 274 ]
272 ] 275 },
273 }, 276 "LAYOUT_iso": {
274 "LAYOUT_iso_wkl": { 277 "layout": [
275 "layout": [ 278 {"x":0, "y":0},
276 { "x": 0, "y": 0 }, 279 {"x":2, "y":0},
277 { "x": 2, "y": 0 }, 280 {"x":3, "y":0},
278 { "x": 3, "y": 0 }, 281 {"x":4, "y":0},
279 { "x": 4, "y": 0 }, 282 {"x":5, "y":0},
280 { "x": 5, "y": 0 }, 283 {"x":6.5, "y":0},
281 { "x": 6.5, "y": 0 }, 284 {"x":7.5, "y":0},
282 { "x": 7.5, "y": 0 }, 285 {"x":8.5, "y":0},
283 { "x": 8.5, "y": 0 }, 286 {"x":9.5, "y":0},
284 { "x": 9.5, "y": 0 }, 287 {"x":11, "y":0},
285 { "x": 11, "y": 0 }, 288 {"x":12, "y":0},
286 { "x": 12, "y": 0 }, 289 {"x":13, "y":0},
287 { "x": 13, "y": 0 }, 290 {"x":14, "y":0},
288 { "x": 14, "y": 0 }, 291 {"x":15.25, "y":0},
289 { "x": 15.25, "y": 0 }, 292
290 293 {"x":0, "y":1.25},
291 { "x": 0, "y": 1.25 }, 294 {"x":1, "y":1.25},
292 { "x": 1, "y": 1.25 }, 295 {"x":2, "y":1.25},
293 { "x": 2, "y": 1.25 }, 296 {"x":3, "y":1.25},
294 { "x": 3, "y": 1.25 }, 297 {"x":4, "y":1.25},
295 { "x": 4, "y": 1.25 }, 298 {"x":5, "y":1.25},
296 { "x": 5, "y": 1.25 }, 299 {"x":6, "y":1.25},
297 { "x": 6, "y": 1.25 }, 300 {"x":7, "y":1.25},
298 { "x": 7, "y": 1.25 }, 301 {"x":8, "y":1.25},
299 { "x": 8, "y": 1.25 }, 302 {"x":9, "y":1.25},
300 { "x": 9, "y": 1.25 }, 303 {"x":10, "y":1.25},
301 { "x": 10, "y": 1.25 }, 304 {"x":11, "y":1.25},
302 { "x": 11, "y": 1.25 }, 305 {"x":12, "y":1.25},
303 { "x": 12, "y": 1.25 }, 306 {"x":13, "y":1.25, "w":2},
304 { "x": 13, "y": 1.25, "w":2}, 307 {"x":15.25, "y":1.25},
305 { "x": 15.25, "y": 1.25 }, 308
306 309 {"x":0, "y":2.25, "w":1.5},
307 { "x": 0, "y": 2.25, "w": 1.5 }, 310 {"x":1.5, "y":2.25},
308 { "x": 1.5, "y": 2.25 }, 311 {"x":2.5, "y":2.25},
309 { "x": 2.5, "y": 2.25 }, 312 {"x":3.5, "y":2.25},
310 { "x": 3.5, "y": 2.25 }, 313 {"x":4.5, "y":2.25},
311 { "x": 4.5, "y": 2.25 }, 314 {"x":5.5, "y":2.25},
312 { "x": 5.5, "y": 2.25 }, 315 {"x":6.5, "y":2.25},
313 { "x": 6.5, "y": 2.25 }, 316 {"x":7.5, "y":2.25},
314 { "x": 7.5, "y": 2.25 }, 317 {"x":8.5, "y":2.25},
315 { "x": 8.5, "y": 2.25 }, 318 {"x":9.5, "y":2.25},
316 { "x": 9.5, "y": 2.25 }, 319 {"x":10.5, "y":2.25},
317 { "x": 10.5, "y": 2.25 }, 320 {"x":11.5, "y":2.25},
318 { "x": 11.5, "y": 2.25 }, 321 {"x":12.5, "y":2.25},
319 { "x": 12.5, "y": 2.25 }, 322 {"x":15.25, "y":2.25},
320 { "x": 13.75, "y":2.25, "w":1.25, "h":2 }, 323
321 { "x": 15.25, "y": 2.25 }, 324 {"x":0, "y":3.25, "w":1.75},
322 325 {"x":1.75, "y":3.25},
323 { "x": 0, "y": 3.25, "w": 1.75 }, 326 {"x":2.75, "y":3.25},
324 { "x": 1.75, "y": 3.25 }, 327 {"x":3.75, "y":3.25},
325 { "x": 2.75, "y": 3.25 }, 328 {"x":4.75, "y":3.25},
326 { "x": 3.75, "y": 3.25 }, 329 {"x":5.75, "y":3.25},
327 { "x": 4.75, "y": 3.25 }, 330 {"x":6.75, "y":3.25},
328 { "x": 5.75, "y": 3.25 }, 331 {"x":7.75, "y":3.25},
329 { "x": 6.75, "y": 3.25 }, 332 {"x":8.75, "y":3.25},
330 { "x": 7.75, "y": 3.25 }, 333 {"x":9.75, "y":3.25},
331 { "x": 8.75, "y": 3.25 }, 334 {"x":10.75, "y":3.25},
332 { "x": 9.75, "y": 3.25 }, 335 {"x":11.75, "y":3.25},
333 { "x": 10.75, "y": 3.25 }, 336 {"x":12.75, "y":3.25},
334 { "x": 11.75, "y": 3.25 }, 337 {"x":13.75, "y":2.25, "w":1.25, "h":2},
335 { "x": 12.75, "y": 3.25 }, 338 {"x":15.25, "y":3.25},
336 { "x": 15.25, "y": 3.25 }, 339
337 340 {"x":0, "y":4.25, "w":1.25},
338 { "x": 0, "y": 4.25, "w": 1.25 }, 341 {"x":1.25, "y":4.25},
339 { "x": 1.25, "y": 4.25 }, 342 {"x":2.25, "y":4.25},
340 { "x": 2.25, "y": 4.25 }, 343 {"x":3.25, "y":4.25},
341 { "x": 3.25, "y": 4.25 }, 344 {"x":4.25, "y":4.25},
342 { "x": 4.25, "y": 4.25 }, 345 {"x":5.25, "y":4.25},
343 { "x": 5.25, "y": 4.25 }, 346 {"x":6.25, "y":4.25},
344 { "x": 6.25, "y": 4.25 }, 347 {"x":7.25, "y":4.25},
345 { "x": 7.25, "y": 4.25 }, 348 {"x":8.25, "y":4.25},
346 { "x": 8.25, "y": 4.25 }, 349 {"x":9.25, "y":4.25},
347 { "x": 9.25, "y": 4.25 }, 350 {"x":10.25, "y":4.25},
348 { "x": 10.25, "y": 4.25 }, 351 {"x":11.25, "y":4.25},
349 { "x": 11.25, "y": 4.25 }, 352 {"x":12.25, "y":4.25, "w":1.75},
350 { "x": 12.25, "y": 4.25, "w":1.75 }, 353 {"x":14.25, "y":4.5},
351 { "x": 14.25, "y": 4.5 }, 354
352 355 {"x":0, "y":5.25, "w":1.25},
353 { "x": 0, "y": 5.25, "w": 1.5}, 356 {"x":1.25, "y":5.25, "w":1.25},
354 { "x": 1.5, "y": 5.25, "w": 1.5}, 357 {"x":2.5, "y":5.25, "w":1.25},
355 { "x": 3, "y": 5.25, "w": 7}, 358 {"x":3.75, "y":5.25, "w":6.25},
356 { "x": 10, "y": 5.25, "w": 1.5}, 359 {"x":10, "y":5.25, "w":1.5},
357 { "x": 11.5, "y": 5.25, "w": 1.5}, 360 {"x":11.5, "y":5.25, "w":1.5},
358 { "x": 13.25, "y": 5.25, "w": 1}, 361 {"x":13.25, "y":5.5},
359 { "x": 14.25, "y": 5.25, "w": 1}, 362 {"x":14.25, "y":5.5},
360 { "x": 15.25, "y": 5.25, "w": 1} 363 {"x":15.25, "y":5.5}
361 ] 364 ]
365 },
366 "LAYOUT_iso_wkl": {
367 "layout": [
368 {"x":0, "y":0},
369 {"x":2, "y":0},
370 {"x":3, "y":0},
371 {"x":4, "y":0},
372 {"x":5, "y":0},
373 {"x":6.5, "y":0},
374 {"x":7.5, "y":0},
375 {"x":8.5, "y":0},
376 {"x":9.5, "y":0},
377 {"x":11, "y":0},
378 {"x":12, "y":0},
379 {"x":13, "y":0},
380 {"x":14, "y":0},
381 {"x":15.25, "y":0},
382
383 {"x":0, "y":1.25},
384 {"x":1, "y":1.25},
385 {"x":2, "y":1.25},
386 {"x":3, "y":1.25},
387 {"x":4, "y":1.25},
388 {"x":5, "y":1.25},
389 {"x":6, "y":1.25},
390 {"x":7, "y":1.25},
391 {"x":8, "y":1.25},
392 {"x":9, "y":1.25},
393 {"x":10, "y":1.25},
394 {"x":11, "y":1.25},
395 {"x":12, "y":1.25},
396 {"x":13, "y":1.25, "w":2},
397 {"x":15.25, "y":1.25},
398
399 {"x":0, "y":2.25, "w":1.5},
400 {"x":1.5, "y":2.25},
401 {"x":2.5, "y":2.25},
402 {"x":3.5, "y":2.25},
403 {"x":4.5, "y":2.25},
404 {"x":5.5, "y":2.25},
405 {"x":6.5, "y":2.25},
406 {"x":7.5, "y":2.25},
407 {"x":8.5, "y":2.25},
408 {"x":9.5, "y":2.25},
409 {"x":10.5, "y":2.25},
410 {"x":11.5, "y":2.25},
411 {"x":12.5, "y":2.25},
412 {"x":15.25, "y":2.25},
413
414 {"x":0, "y":3.25, "w":1.75},
415 {"x":1.75, "y":3.25},
416 {"x":2.75, "y":3.25},
417 {"x":3.75, "y":3.25},
418 {"x":4.75, "y":3.25},
419 {"x":5.75, "y":3.25},
420 {"x":6.75, "y":3.25},
421 {"x":7.75, "y":3.25},
422 {"x":8.75, "y":3.25},
423 {"x":9.75, "y":3.25},
424 {"x":10.75, "y":3.25},
425 {"x":11.75, "y":3.25},
426 {"x":12.75, "y":3.25},
427 {"x":13.75, "y":2.25, "w":1.25, "h":2},
428 {"x":15.25, "y":3.25},
429
430 {"x":0, "y":4.25, "w":1.25},
431 {"x":1.25, "y":4.25},
432 {"x":2.25, "y":4.25},
433 {"x":3.25, "y":4.25},
434 {"x":4.25, "y":4.25},
435 {"x":5.25, "y":4.25},
436 {"x":6.25, "y":4.25},
437 {"x":7.25, "y":4.25},
438 {"x":8.25, "y":4.25},
439 {"x":9.25, "y":4.25},
440 {"x":10.25, "y":4.25},
441 {"x":11.25, "y":4.25},
442 {"x":12.25, "y":4.25, "w":1.75},
443 {"x":14.25, "y":4.5},
444
445 {"x":0, "y":5.25, "w":1.5},
446 {"x":1.5, "y":5.25, "w":1.5},
447 {"x":3, "y":5.25, "w":7},
448 {"x":10, "y":5.25, "w":1.5},
449 {"x":11.5, "y":5.25, "w":1.5},
450 {"x":13.25, "y":5.5},
451 {"x":14.25, "y":5.5},
452 {"x":15.25, "y":5.5}
453 ]
454 }
362 } 455 }
363 }
364} 456}
diff --git a/keyboards/linworks/whale75/keymaps/default/keymap.c b/keyboards/linworks/whale75/keymaps/default/keymap.c
index a2298865e..8aa21048e 100644
--- a/keyboards/linworks/whale75/keymaps/default/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/default/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE,
22 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_TRNS, KC_BSPC, KC_INS, 22 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_TRNS, KC_BSPC, KC_INS,
23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, 23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, 24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 28
@@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30 RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI, KC_MPLY, 30 RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, RGB_SPI, RGB_SPI, KC_MPLY,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS 35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(1), KC_TRNS, KC_TRNS, KC_TRNS
36 ), 36 ),
37}; 37};
diff --git a/keyboards/linworks/whale75/keymaps/via/keymap.c b/keyboards/linworks/whale75/keymaps/via/keymap.c
index 3412e8397..eab5f110d 100644
--- a/keyboards/linworks/whale75/keymaps/via/keymap.c
+++ b/keyboards/linworks/whale75/keymaps/via/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, 21 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE,
22 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_TRNS, KC_BSPC, KC_INS, 22 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_TRNS, KC_BSPC, KC_INS,
23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, 23 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, 24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME, 25 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
27 ), 27 ),
28 28
@@ -30,16 +30,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30 RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_MPLY, 30 RGB_TOG, RGB_VAD, RGB_VAI, BL_DEC, BL_INC, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_RMOD, RGB_MOD, KC_TRNS, KC_TRNS, KC_MPLY,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, 31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, 34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 ), 36 ),
37 [2] = LAYOUT_all( /* keymap for layer 2 */ 37 [2] = LAYOUT_all( /* keymap for layer 2 */
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
44 ), 44 ),
45 45
@@ -47,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 52 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
53 ), 53 ),
54}; 54};
diff --git a/keyboards/linworks/whale75/whale75.c b/keyboards/linworks/whale75/whale75.c
index 4bce30adf..ef86e0268 100644
--- a/keyboards/linworks/whale75/whale75.c
+++ b/keyboards/linworks/whale75/whale75.c
@@ -14,3 +14,29 @@
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#include "whale75.h" 16#include "whale75.h"
17
18#if defined(ENCODER_ENABLE)
19bool encoder_update_kb(uint8_t index, bool clockwise) {
20 if (!encoder_update_user(index, clockwise)) { return false; }
21 if (index == 0) {
22 /* The switch case allows for different encoder mappings on different layers, "default" map gets applied for all unspecified layers */
23 switch(get_highest_layer(layer_state)){
24 case 1:
25 if (clockwise) {
26 tap_code(KC_MNXT);
27 } else {
28 tap_code(KC_MPRV);
29 }
30 break;
31 default:
32 if (clockwise){
33 tap_code(KC_VOLU);
34 } else{
35 tap_code(KC_VOLD);
36 }
37 break;
38 }
39 }
40 return true;
41}
42#endif
diff --git a/keyboards/linworks/whale75/whale75.h b/keyboards/linworks/whale75/whale75.h
index f5ba205ec..44b77a1dd 100644
--- a/keyboards/linworks/whale75/whale75.h
+++ b/keyboards/linworks/whale75/whale75.h
@@ -18,82 +18,105 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define XXX KC_NO
22
23/*
24 * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
25 * │00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │
26 * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
27 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐ ┌───────┐
28 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │1F │ │1E │ 2u Backspace
29 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤ └─┬─────┤
30 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ │2F │ │ │
31 * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤ ┌──┴┐3E │ ISO
32 * LShift │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │ │4F │ │3D │ │ Enter
33 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ └───┘ └───┴────┘
34 * │40 │ │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D │ ┌───┐
35 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘ │4E │
36 * │50 │51 │52 │56 │5A │5B │ ┌───┼───┼───┐
37 * └────┴────┴────┴────────────────────────┴─────┴─────┘ │5D │5E │5F │
38 * └───┴───┴───┘
39 * ┌─────┬─────┬───────────────────────────┬─────┬─────┐
40 * WKL │50 │52 │56 │5A │5B │
41 * └─────┴─────┴───────────────────────────┴─────┴─────┘
42 */
43
21#define LAYOUT_all( \ 44#define LAYOUT_all( \
22 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ 45 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
23 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ 46 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
24 K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ 47 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
25 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ 48 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K4F, \
26 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ 49 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \
27 K500, K501, K502, K506, K510, K511, K513, K514, K515 \ 50 K50, K51, K52, K56, K5A, K5B, K5D, K5E, K5F \
28) { \ 51) { \
29 { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ 52 { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
30 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ 53 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
31 { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ 54 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
32 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \ 55 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX }, \
33 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ 56 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
34 { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \ 57 { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F } \
35} 58}
36 59
37#define LAYOUT_ansi( \ 60#define LAYOUT_ansi( \
38 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ 61 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
39 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ 62 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
40 K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ 63 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
41 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ 64 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K4F, \
42 K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ 65 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \
43 K500, K501, K502, K506, K510, K511, K513, K514, K515 \ 66 K50, K51, K52, K56, K5A, K5B, K5D, K5E, K5F \
44) { \ 67) { \
45 { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ 68 { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
46 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ 69 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
47 { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ 70 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
48 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, KC_NO }, \ 71 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, XXX }, \
49 { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ 72 { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
50 { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \ 73 { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F } \
51} 74}
52 75
53#define LAYOUT_ansi_wkl( \ 76#define LAYOUT_ansi_wkl( \
54 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ 77 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
55 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ 78 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
56 K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ 79 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
57 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ 80 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K4F, \
58 K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ 81 K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \
59 K500, K502, K506, K510, K511, K513, K514, K515 \ 82 K50, K52, K56, K5A, K5B, K5D, K5E, K5F \
60) { \ 83) { \
61 { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ 84 { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
62 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ 85 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
63 { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ 86 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
64 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314, KC_NO }, \ 87 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, XXX }, \
65 { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ 88 { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
66 { K500, KC_NO, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \ 89 { K50, XXX, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F } \
67} 90}
68 91
69#define LAYOUT_iso( \ 92#define LAYOUT_iso( \
70 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ 93 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
71 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ 94 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
72 K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ 95 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
73 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ 96 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K4F, \
74 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ 97 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \
75 K500, K501, K502, K506, K510, K511, K513, K514, K515 \ 98 K50, K51, K52, K56, K5A, K5B, K5D, K5E, K5F \
76) { \ 99) { \
77 { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ 100 { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
78 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ 101 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
79 { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ 102 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
80 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \ 103 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX }, \
81 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ 104 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
82 { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \ 105 { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F } \
83} 106}
84 107
85#define LAYOUT_iso_wkl( \ 108#define LAYOUT_iso_wkl( \
86 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ 109 K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, \
87 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ 110 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
88 K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ 111 K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
89 K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ 112 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K4F, \
90 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, K415, \ 113 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \
91 K500, K502, K506, K510, K511, K513, K514, K515 \ 114 K50, K52, K56, K5A, K5B, K5D, K5E, K5F \
92) { \ 115) { \
93 { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ 116 { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F }, \
94 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ 117 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F }, \
95 { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ 118 { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
96 { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, KC_NO }, \ 119 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX }, \
97 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414, K415 }, \ 120 { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \
98 { K500, KC_NO, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, KC_NO, K513, K514, K515 } \ 121 { K50, XXX, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F } \
99} 122}