summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2023-07-07 07:57:47 -0700
committerGitHub <noreply@github.com>2023-07-08 00:57:47 +1000
commitddc45719864e934bcb53576057c2423ed558cbc8 (patch)
tree2ea226e1a5739c407bdd0b7a180be8bca5dd1700
parentf5a788a47ba75e3c4f54aaceb384d7c9860c4112 (diff)
AMJKeyboard AMJ84 Touch-Up (#21463)
-rw-r--r--keyboards/amjkeyboard/amj84/info.json362
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default/keymap.c4
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default_ansi_rwkl/keymap.c57
-rw-r--r--keyboards/amjkeyboard/amj84/keymaps/default_iso_rwkl/keymap.c57
-rw-r--r--keyboards/amjkeyboard/amj84/matrix_diagram.md24
5 files changed, 415 insertions, 89 deletions
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
index 98c4a7e447..0b4d614c6e 100644
--- a/keyboards/amjkeyboard/amj84/info.json
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -20,100 +20,288 @@
20 }, 20 },
21 "processor": "atmega32u4", 21 "processor": "atmega32u4",
22 "bootloader": "atmel-dfu", 22 "bootloader": "atmel-dfu",
23 "layout_aliases": {
24 "LAYOUT": "LAYOUT_all"
25 },
23 "layouts": { 26 "layouts": {
24 "LAYOUT": { 27 "LAYOUT_all": {
28 "layout": [
29 {"matrix": [0, 0], "x": 0, "y": 0},
30 {"matrix": [0, 1], "x": 1, "y": 0},
31 {"matrix": [0, 2], "x": 2, "y": 0},
32 {"matrix": [0, 3], "x": 3, "y": 0},
33 {"matrix": [0, 4], "x": 4, "y": 0},
34 {"matrix": [0, 5], "x": 5, "y": 0},
35 {"matrix": [0, 6], "x": 6, "y": 0},
36 {"matrix": [0, 7], "x": 7, "y": 0},
37 {"matrix": [0, 8], "x": 8, "y": 0},
38 {"matrix": [0, 9], "x": 9, "y": 0},
39 {"matrix": [0, 10], "x": 10, "y": 0},
40 {"matrix": [0, 11], "x": 11, "y": 0},
41 {"matrix": [0, 12], "x": 12, "y": 0},
42 {"matrix": [0, 13], "x": 13, "y": 0},
43 {"matrix": [0, 14], "x": 15, "y": 0},
44
45 {"matrix": [1, 0], "x": 0, "y": 1},
46 {"matrix": [1, 1], "x": 1, "y": 1},
47 {"matrix": [1, 2], "x": 2, "y": 1},
48 {"matrix": [1, 3], "x": 3, "y": 1},
49 {"matrix": [1, 4], "x": 4, "y": 1},
50 {"matrix": [1, 5], "x": 5, "y": 1},
51 {"matrix": [1, 6], "x": 6, "y": 1},
52 {"matrix": [1, 7], "x": 7, "y": 1},
53 {"matrix": [1, 8], "x": 8, "y": 1},
54 {"matrix": [1, 9], "x": 9, "y": 1},
55 {"matrix": [1, 10], "x": 10, "y": 1},
56 {"matrix": [1, 11], "x": 11, "y": 1},
57 {"matrix": [1, 12], "x": 12, "y": 1},
58 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
59 {"matrix": [1, 14], "x": 15, "y": 1},
60
61 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
62 {"matrix": [2, 1], "x": 1.5, "y": 2},
63 {"matrix": [2, 2], "x": 2.5, "y": 2},
64 {"matrix": [2, 3], "x": 3.5, "y": 2},
65 {"matrix": [2, 4], "x": 4.5, "y": 2},
66 {"matrix": [2, 5], "x": 5.5, "y": 2},
67 {"matrix": [2, 6], "x": 6.5, "y": 2},
68 {"matrix": [2, 7], "x": 7.5, "y": 2},
69 {"matrix": [2, 8], "x": 8.5, "y": 2},
70 {"matrix": [2, 9], "x": 9.5, "y": 2},
71 {"matrix": [2, 10], "x": 10.5, "y": 2},
72 {"matrix": [2, 11], "x": 11.5, "y": 2},
73 {"matrix": [2, 12], "x": 12.5, "y": 2},
74 {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
75 {"matrix": [2, 14], "x": 15, "y": 2},
76
77 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
78 {"matrix": [3, 1], "x": 1.75, "y": 3},
79 {"matrix": [3, 2], "x": 2.75, "y": 3},
80 {"matrix": [3, 3], "x": 3.75, "y": 3},
81 {"matrix": [3, 4], "x": 4.75, "y": 3},
82 {"matrix": [3, 5], "x": 5.75, "y": 3},
83 {"matrix": [3, 6], "x": 6.75, "y": 3},
84 {"matrix": [3, 7], "x": 7.75, "y": 3},
85 {"matrix": [3, 8], "x": 8.75, "y": 3},
86 {"matrix": [3, 9], "x": 9.75, "y": 3},
87 {"matrix": [3, 10], "x": 10.75, "y": 3},
88 {"matrix": [3, 11], "x": 11.75, "y": 3},
89 {"matrix": [3, 12], "x": 12.75, "y": 3},
90 {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
91 {"matrix": [3, 14], "x": 15, "y": 3},
92
93 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
94 {"matrix": [4, 1], "x": 1.25, "y": 4},
95 {"matrix": [4, 2], "x": 2.25, "y": 4},
96 {"matrix": [4, 3], "x": 3.25, "y": 4},
97 {"matrix": [4, 4], "x": 4.25, "y": 4},
98 {"matrix": [4, 5], "x": 5.25, "y": 4},
99 {"matrix": [4, 6], "x": 6.25, "y": 4},
100 {"matrix": [4, 7], "x": 7.25, "y": 4},
101 {"matrix": [4, 8], "x": 8.25, "y": 4},
102 {"matrix": [4, 9], "x": 9.25, "y": 4},
103 {"matrix": [4, 10], "x": 10.25, "y": 4},
104 {"matrix": [4, 11], "x": 11.25, "y": 4},
105 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
106 {"matrix": [4, 13], "x": 14, "y": 4},
107 {"matrix": [4, 14], "x": 15, "y": 4},
108
109 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
110 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
111 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
112 {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
113 {"matrix": [5, 8], "x": 14, "y": 0},
114 {"matrix": [5, 9], "x": 10, "y": 5},
115 {"matrix": [5, 10], "x": 11, "y": 5},
116 {"matrix": [5, 11], "x": 12, "y": 5},
117 {"matrix": [5, 12], "x": 13, "y": 5},
118 {"matrix": [5, 13], "x": 14, "y": 5},
119 {"matrix": [5, 14], "x": 15, "y": 5}
120 ]
121 },
122 "LAYOUT_75_ansi_rwkl": {
123 "layout": [
124 {"matrix": [0, 0], "x": 0, "y": 0},
125 {"matrix": [0, 1], "x": 1, "y": 0},
126 {"matrix": [0, 2], "x": 2, "y": 0},
127 {"matrix": [0, 3], "x": 3, "y": 0},
128 {"matrix": [0, 4], "x": 4, "y": 0},
129 {"matrix": [0, 5], "x": 5, "y": 0},
130 {"matrix": [0, 6], "x": 6, "y": 0},
131 {"matrix": [0, 7], "x": 7, "y": 0},
132 {"matrix": [0, 8], "x": 8, "y": 0},
133 {"matrix": [0, 9], "x": 9, "y": 0},
134 {"matrix": [0, 10], "x": 10, "y": 0},
135 {"matrix": [0, 11], "x": 11, "y": 0},
136 {"matrix": [0, 12], "x": 12, "y": 0},
137 {"matrix": [0, 13], "x": 13, "y": 0},
138 {"matrix": [5, 8], "x": 14, "y": 0},
139 {"matrix": [0, 14], "x": 15, "y": 0},
140
141 {"matrix": [1, 0], "x": 0, "y": 1},
142 {"matrix": [1, 1], "x": 1, "y": 1},
143 {"matrix": [1, 2], "x": 2, "y": 1},
144 {"matrix": [1, 3], "x": 3, "y": 1},
145 {"matrix": [1, 4], "x": 4, "y": 1},
146 {"matrix": [1, 5], "x": 5, "y": 1},
147 {"matrix": [1, 6], "x": 6, "y": 1},
148 {"matrix": [1, 7], "x": 7, "y": 1},
149 {"matrix": [1, 8], "x": 8, "y": 1},
150 {"matrix": [1, 9], "x": 9, "y": 1},
151 {"matrix": [1, 10], "x": 10, "y": 1},
152 {"matrix": [1, 11], "x": 11, "y": 1},
153 {"matrix": [1, 12], "x": 12, "y": 1},
154 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
155 {"matrix": [1, 14], "x": 15, "y": 1},
156
157 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
158 {"matrix": [2, 1], "x": 1.5, "y": 2},
159 {"matrix": [2, 2], "x": 2.5, "y": 2},
160 {"matrix": [2, 3], "x": 3.5, "y": 2},
161 {"matrix": [2, 4], "x": 4.5, "y": 2},
162 {"matrix": [2, 5], "x": 5.5, "y": 2},
163 {"matrix": [2, 6], "x": 6.5, "y": 2},
164 {"matrix": [2, 7], "x": 7.5, "y": 2},
165 {"matrix": [2, 8], "x": 8.5, "y": 2},
166 {"matrix": [2, 9], "x": 9.5, "y": 2},
167 {"matrix": [2, 10], "x": 10.5, "y": 2},
168 {"matrix": [2, 11], "x": 11.5, "y": 2},
169 {"matrix": [2, 12], "x": 12.5, "y": 2},
170 {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
171 {"matrix": [2, 14], "x": 15, "y": 2},
172
173 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
174 {"matrix": [3, 1], "x": 1.75, "y": 3},
175 {"matrix": [3, 2], "x": 2.75, "y": 3},
176 {"matrix": [3, 3], "x": 3.75, "y": 3},
177 {"matrix": [3, 4], "x": 4.75, "y": 3},
178 {"matrix": [3, 5], "x": 5.75, "y": 3},
179 {"matrix": [3, 6], "x": 6.75, "y": 3},
180 {"matrix": [3, 7], "x": 7.75, "y": 3},
181 {"matrix": [3, 8], "x": 8.75, "y": 3},
182 {"matrix": [3, 9], "x": 9.75, "y": 3},
183 {"matrix": [3, 10], "x": 10.75, "y": 3},
184 {"matrix": [3, 11], "x": 11.75, "y": 3},
185 {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
186 {"matrix": [3, 14], "x": 15, "y": 3},
187
188 {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
189 {"matrix": [4, 2], "x": 2.25, "y": 4},
190 {"matrix": [4, 3], "x": 3.25, "y": 4},
191 {"matrix": [4, 4], "x": 4.25, "y": 4},
192 {"matrix": [4, 5], "x": 5.25, "y": 4},
193 {"matrix": [4, 6], "x": 6.25, "y": 4},
194 {"matrix": [4, 7], "x": 7.25, "y": 4},
195 {"matrix": [4, 8], "x": 8.25, "y": 4},
196 {"matrix": [4, 9], "x": 9.25, "y": 4},
197 {"matrix": [4, 10], "x": 10.25, "y": 4},
198 {"matrix": [4, 11], "x": 11.25, "y": 4},
199 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
200 {"matrix": [4, 13], "x": 14, "y": 4},
201 {"matrix": [4, 14], "x": 15, "y": 4},
202
203 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
204 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
205 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
206 {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
207 {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
208 {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
209 {"matrix": [5, 12], "x": 13, "y": 5},
210 {"matrix": [5, 13], "x": 14, "y": 5},
211 {"matrix": [5, 14], "x": 15, "y": 5}
212 ]
213 },
214 "LAYOUT_75_iso_rwkl": {
25 "layout": [ 215 "layout": [
26 {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, 216 {"matrix": [0, 0], "x": 0, "y": 0},
27 {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, 217 {"matrix": [0, 1], "x": 1, "y": 0},
28 {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, 218 {"matrix": [0, 2], "x": 2, "y": 0},
29 {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, 219 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, 220 {"matrix": [0, 4], "x": 4, "y": 0},
31 {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, 221 {"matrix": [0, 5], "x": 5, "y": 0},
32 {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, 222 {"matrix": [0, 6], "x": 6, "y": 0},
33 {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, 223 {"matrix": [0, 7], "x": 7, "y": 0},
34 {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, 224 {"matrix": [0, 8], "x": 8, "y": 0},
35 {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, 225 {"matrix": [0, 9], "x": 9, "y": 0},
36 {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, 226 {"matrix": [0, 10], "x": 10, "y": 0},
37 {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0}, 227 {"matrix": [0, 11], "x": 11, "y": 0},
38 {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0}, 228 {"matrix": [0, 12], "x": 12, "y": 0},
39 {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0}, 229 {"matrix": [0, 13], "x": 13, "y": 0},
40 {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0}, 230 {"matrix": [5, 8], "x": 14, "y": 0},
41 {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0}, 231 {"matrix": [0, 14], "x": 15, "y": 0},
42 232
43 {"label": "K11", "matrix": [1, 1], "x": 0, "y": 1}, 233 {"matrix": [1, 0], "x": 0, "y": 1},
44 {"label": "K12", "matrix": [1, 2], "x": 1, "y": 1}, 234 {"matrix": [1, 1], "x": 1, "y": 1},
45 {"label": "K13", "matrix": [1, 3], "x": 2, "y": 1}, 235 {"matrix": [1, 2], "x": 2, "y": 1},
46 {"label": "K14", "matrix": [1, 4], "x": 3, "y": 1}, 236 {"matrix": [1, 3], "x": 3, "y": 1},
47 {"label": "K15", "matrix": [1, 5], "x": 4, "y": 1}, 237 {"matrix": [1, 4], "x": 4, "y": 1},
48 {"label": "K16", "matrix": [1, 6], "x": 5, "y": 1}, 238 {"matrix": [1, 5], "x": 5, "y": 1},
49 {"label": "K17", "matrix": [1, 7], "x": 6, "y": 1}, 239 {"matrix": [1, 6], "x": 6, "y": 1},
50 {"label": "K18", "matrix": [1, 8], "x": 7, "y": 1}, 240 {"matrix": [1, 7], "x": 7, "y": 1},
51 {"label": "K19", "matrix": [1, 9], "x": 8, "y": 1}, 241 {"matrix": [1, 8], "x": 8, "y": 1},
52 {"label": "K1A", "matrix": [1, 10], "x": 9, "y": 1}, 242 {"matrix": [1, 9], "x": 9, "y": 1},
53 {"label": "K1B", "matrix": [1, 11], "x": 10, "y": 1}, 243 {"matrix": [1, 10], "x": 10, "y": 1},
54 {"label": "K1C", "matrix": [1, 12], "x": 11, "y": 1}, 244 {"matrix": [1, 11], "x": 11, "y": 1},
55 {"label": "K1D", "matrix": [1, 13], "x": 12, "y": 1}, 245 {"matrix": [1, 12], "x": 12, "y": 1},
56 {"label": "K1E", "matrix": [1, 14], "x": 13, "y": 1, "w": 2}, 246 {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
57 {"label": "K20", "matrix": [2, 0], "x": 15, "y": 1}, 247 {"matrix": [1, 14], "x": 15, "y": 1},
58 248
59 {"label": "K21", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.5}, 249 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
60 {"label": "K22", "matrix": [2, 2], "x": 1.5, "y": 2}, 250 {"matrix": [2, 1], "x": 1.5, "y": 2},
61 {"label": "K23", "matrix": [2, 3], "x": 2.5, "y": 2}, 251 {"matrix": [2, 2], "x": 2.5, "y": 2},
62 {"label": "K24", "matrix": [2, 4], "x": 3.5, "y": 2}, 252 {"matrix": [2, 3], "x": 3.5, "y": 2},
63 {"label": "K25", "matrix": [2, 5], "x": 4.5, "y": 2}, 253 {"matrix": [2, 4], "x": 4.5, "y": 2},
64 {"label": "K26", "matrix": [2, 6], "x": 5.5, "y": 2}, 254 {"matrix": [2, 5], "x": 5.5, "y": 2},
65 {"label": "K27", "matrix": [2, 7], "x": 6.5, "y": 2}, 255 {"matrix": [2, 6], "x": 6.5, "y": 2},
66 {"label": "K28", "matrix": [2, 8], "x": 7.5, "y": 2}, 256 {"matrix": [2, 7], "x": 7.5, "y": 2},
67 {"label": "K29", "matrix": [2, 9], "x": 8.5, "y": 2}, 257 {"matrix": [2, 8], "x": 8.5, "y": 2},
68 {"label": "K2A", "matrix": [2, 10], "x": 9.5, "y": 2}, 258 {"matrix": [2, 9], "x": 9.5, "y": 2},
69 {"label": "K2B", "matrix": [2, 11], "x": 10.5, "y": 2}, 259 {"matrix": [2, 10], "x": 10.5, "y": 2},
70 {"label": "K2C", "matrix": [2, 12], "x": 11.5, "y": 2}, 260 {"matrix": [2, 11], "x": 11.5, "y": 2},
71 {"label": "K2D", "matrix": [2, 13], "x": 12.5, "y": 2}, 261 {"matrix": [2, 12], "x": 12.5, "y": 2},
72 {"label": "K2E", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, 262 {"matrix": [2, 14], "x": 15, "y": 2},
73 {"label": "K30", "matrix": [3, 0], "x": 15, "y": 2},
74 263
75 {"label": "K31", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.75}, 264 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
76 {"label": "K32", "matrix": [3, 2], "x": 1.75, "y": 3}, 265 {"matrix": [3, 1], "x": 1.75, "y": 3},
77 {"label": "K33", "matrix": [3, 3], "x": 2.75, "y": 3}, 266 {"matrix": [3, 2], "x": 2.75, "y": 3},
78 {"label": "K34", "matrix": [3, 4], "x": 3.75, "y": 3}, 267 {"matrix": [3, 3], "x": 3.75, "y": 3},
79 {"label": "K35", "matrix": [3, 5], "x": 4.75, "y": 3}, 268 {"matrix": [3, 4], "x": 4.75, "y": 3},
80 {"label": "K36", "matrix": [3, 6], "x": 5.75, "y": 3}, 269 {"matrix": [3, 5], "x": 5.75, "y": 3},
81 {"label": "K37", "matrix": [3, 7], "x": 6.75, "y": 3}, 270 {"matrix": [3, 6], "x": 6.75, "y": 3},
82 {"label": "K38", "matrix": [3, 8], "x": 7.75, "y": 3}, 271 {"matrix": [3, 7], "x": 7.75, "y": 3},
83 {"label": "K39", "matrix": [3, 9], "x": 8.75, "y": 3}, 272 {"matrix": [3, 8], "x": 8.75, "y": 3},
84 {"label": "K3A", "matrix": [3, 10], "x": 9.75, "y": 3}, 273 {"matrix": [3, 9], "x": 9.75, "y": 3},
85 {"label": "K3B", "matrix": [3, 11], "x": 10.75, "y": 3}, 274 {"matrix": [3, 10], "x": 10.75, "y": 3},
86 {"label": "K3C", "matrix": [3, 12], "x": 11.75, "y": 3}, 275 {"matrix": [3, 11], "x": 11.75, "y": 3},
87 {"label": "K3D", "matrix": [3, 13], "x": 12.75, "y": 3}, 276 {"matrix": [3, 12], "x": 12.75, "y": 3},
88 {"label": "K3E", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25}, 277 {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
89 {"label": "K40", "matrix": [4, 0], "x": 15, "y": 3}, 278 {"matrix": [3, 14], "x": 15, "y": 3},
90 279
91 {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, 280 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
92 {"label": "K42", "matrix": [4, 2], "x": 2.25, "y": 4}, 281 {"matrix": [4, 1], "x": 1.25, "y": 4},
93 {"label": "K43", "matrix": [4, 3], "x": 3.25, "y": 4}, 282 {"matrix": [4, 2], "x": 2.25, "y": 4},
94 {"label": "K44", "matrix": [4, 4], "x": 4.25, "y": 4}, 283 {"matrix": [4, 3], "x": 3.25, "y": 4},
95 {"label": "K45", "matrix": [4, 5], "x": 5.25, "y": 4}, 284 {"matrix": [4, 4], "x": 4.25, "y": 4},
96 {"label": "K46", "matrix": [4, 6], "x": 6.25, "y": 4}, 285 {"matrix": [4, 5], "x": 5.25, "y": 4},
97 {"label": "K47", "matrix": [4, 7], "x": 7.25, "y": 4}, 286 {"matrix": [4, 6], "x": 6.25, "y": 4},
98 {"label": "K48", "matrix": [4, 8], "x": 8.25, "y": 4}, 287 {"matrix": [4, 7], "x": 7.25, "y": 4},
99 {"label": "K49", "matrix": [4, 9], "x": 9.25, "y": 4}, 288 {"matrix": [4, 8], "x": 8.25, "y": 4},
100 {"label": "K4A", "matrix": [4, 10], "x": 10.25, "y": 4}, 289 {"matrix": [4, 9], "x": 9.25, "y": 4},
101 {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4}, 290 {"matrix": [4, 10], "x": 10.25, "y": 4},
102 {"label": "K4C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, 291 {"matrix": [4, 11], "x": 11.25, "y": 4},
103 {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4}, 292 {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
104 {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}, 293 {"matrix": [4, 13], "x": 14, "y": 4},
294 {"matrix": [4, 14], "x": 15, "y": 4},
105 295
106 {"label": "K50", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, 296 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
107 {"label": "K51", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, 297 {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
108 {"label": "K52", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, 298 {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
109 {"label": "K55", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 5.25}, 299 {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
110 {"label": "K58", "matrix": [5, 8], "x": 9, "y": 5}, 300 {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
111 {"label": "K59", "matrix": [5, 9], "x": 10, "y": 5}, 301 {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5},
112 {"label": "K5A", "matrix": [5, 10], "x": 11, "y": 5}, 302 {"matrix": [5, 12], "x": 13, "y": 5},
113 {"label": "K5B", "matrix": [5, 11], "x": 12, "y": 5}, 303 {"matrix": [5, 13], "x": 14, "y": 5},
114 {"label": "K5C", "matrix": [5, 12], "x": 13, "y": 5}, 304 {"matrix": [5, 14], "x": 15, "y": 5}
115 {"label": "K5D", "matrix": [5, 13], "x": 14, "y": 5},
116 {"label": "K5E", "matrix": [5, 14], "x": 15, "y": 5}
117 ] 305 ]
118 } 306 }
119 } 307 }
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
index bf5a8deb05..c6a4747a83 100644
--- a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
22 * |Ctrl|Win |Alt | Space |END|Alt |Ctrl|Left |Down|Rig| 22 * |Ctrl|Win |Alt | Space |END|Alt |Ctrl|Left |Down|Rig|
23 * `----------------------------------------------------------------' 23 * `----------------------------------------------------------------'
24 */ 24 */
25 [0] = LAYOUT( 25 [0] = LAYOUT_all(
26 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_HOME,KC_DEL, 26 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_HOME,KC_DEL,
27 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_BSPC,KC_PGUP, 27 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_BSPC,KC_PGUP,
28 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_PGDN, 28 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_PGDN,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
42 * | | | | | | | | | 42 * | | | | | | | | |
43 * `-----------------------------------------------------------' 43 * `-----------------------------------------------------------'
44 */ 44 */
45 [1] = LAYOUT( 45 [1] = LAYOUT_all(
46 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, 46 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,
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,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,KC_TRNS,
48 KC_TRNS,KC_TRNS,KC_UP, KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS, 48 KC_TRNS,KC_TRNS,KC_UP, KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SCRL,KC_PAUS,KC_TRNS,KC_TRNS,
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default_ansi_rwkl/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default_ansi_rwkl/keymap.c
new file mode 100644
index 0000000000..973679d6f5
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/keymaps/default_ansi_rwkl/keymap.c
@@ -0,0 +1,57 @@
1// Copyright 2022 peepeetee (@peepeetee)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include QMK_KEYBOARD_H
5
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7
8 /* Base */
9 /* Keymap 0: Default Layer
10 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
11 * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Hm │End│Del│
12 * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
13 * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bkspc │PgU│
14 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
15 * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgD│
16 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
17 * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter │Ins│
18 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
19 * │Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Up │Fn │
20 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
21 * │Ctrl│GUI │Alt │Space │Alt │Ctrl │Lft│Dwn│Rig│
22 * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
23 */
24 [0] = LAYOUT_75_ansi_rwkl(
25 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_HOME, KC_END, KC_DEL,
26 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_BSPC, KC_PGUP,
27 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_PGDN,
28 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_ENT, KC_INS,
29 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
30 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
31 ),
32
33 /* Keymap 1: Fn Layer
34 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
35 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
36 * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
37 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
38 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
39 * │ │ │Up │ │ │ │Cal│ │Ins│ │PSc│SLk│Pau│ │ │
40 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
41 * │BL Brt│Lft│Dwn│Rgt│ │ │ │ │ │ │Hm │PUp│ │ │
42 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
43 * │BL Step │ │App│ │ │ │Vl-│Vl+│Mut│End│PDn│ │ │ │
44 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
45 * │Slp │ │ │ │ │ │ │ │ │
46 * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
47 */
48 [1] = LAYOUT_75_ansi_rwkl(
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______,
52 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,
53 BL_STEP, _______, KC_APP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, _______, _______, _______,
54 KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______
55 )
56
57};
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default_iso_rwkl/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default_iso_rwkl/keymap.c
new file mode 100644
index 0000000000..d64dfffea0
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/keymaps/default_iso_rwkl/keymap.c
@@ -0,0 +1,57 @@
1// Copyright 2022 peepeetee (@peepeetee)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include QMK_KEYBOARD_H
5
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7
8 /* Base */
9 /* Keymap 0: Default Layer
10 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
11 * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Hm │End│Del│
12 * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
13 * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bkspc │PgU│
14 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
15 * │Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │PgD│
16 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐Ent ├───┤
17 * │Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │Ins│
18 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
19 * │Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Up │Fn │
20 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
21 * │Ctrl│GUI │Alt │Space │Alt │Ctrl │Lft│Dwn│Rig│
22 * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
23 */
24 [0] = LAYOUT_75_iso_rwkl(
25 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_HOME, KC_END, KC_DEL,
26 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_BSPC, KC_PGUP,
27 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_PGDN,
28 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_INS,
29 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, MO(1),
30 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
31 ),
32
33 /* Keymap 1: Fn Layer
34 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
35 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
36 * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
37 * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
38 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
39 * │ │ │Up │ │ │ │Cal│ │Ins│ │PSc│SLk│Pau│ │ │
40 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤
41 * │BL Brt│Lft│Dwn│Rgt│ │ │ │ │ │ │Hm │PUp│ │ │ │
42 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
43 * │BL Step │ │App│ │ │ │Vl-│Vl+│Mut│End│PDn│ │ │ │
44 * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
45 * │Slp │ │ │ │ │ │ │ │ │
46 * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
47 */
48 [1] = LAYOUT_75_iso_rwkl(
49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
52 BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
53 BL_STEP, _______, _______, KC_APP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, _______, _______, _______,
54 KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______
55 )
56
57};
diff --git a/keyboards/amjkeyboard/amj84/matrix_diagram.md b/keyboards/amjkeyboard/amj84/matrix_diagram.md
new file mode 100644
index 0000000000..c09506c3a5
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/matrix_diagram.md
@@ -0,0 +1,24 @@
1# Matrix Diagram for AMJKeyboard AMJ84
2
3```
4┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
5│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │58 │0E │
6├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
7│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │
8├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ ┌─────┐
9│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ │ │
10├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐3D │ ISO Enter
11│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ │3C │ │
12├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
13│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │
14├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
15│50 │51 │52 │55 │59 │5A │5B │5C │5D │5E │
16└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
17┌────────┐ └─────┬─────┘
18│40 │ 2.25u LShift │
19└────────┘ ┌─────┴─────┐
20┌─────┬───┬─────┬───────────────────────┬─────┬─────┐
21│50 │51 │52 │55 │5A │5B │ RWKL
22└─────┴───┴─────┴───────────────────────┴─────┴─────┘
23 1.5u 1u 1.5u 6u
24```