aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-01 02:51:13 +0000
committerQMK Bot <hello@qmk.fm>2021-09-01 02:51:13 +0000
commit971d36bb9ea37962c57733e5f7c0c24e5a6cebeb (patch)
tree7b48dbe4eee2d869920da30140b3e1191b8b727f
parentd019c8a991a2f559b2bc7530342110d54b30c5ac (diff)
parent8d97c54770ef5205455dc7d8b004fcaf3d148168 (diff)
downloadqmk_firmware-971d36bb9ea37962c57733e5f7c0c24e5a6cebeb.tar.gz
qmk_firmware-971d36bb9ea37962c57733e5f7c0c24e5a6cebeb.zip
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-xkeyboards/mnk50/info.json162
-rw-r--r--keyboards/mnk50/mnk50.h39
2 files changed, 200 insertions, 1 deletions
diff --git a/keyboards/mnk50/info.json b/keyboards/mnk50/info.json
index d92c75ed3..2fcb63a9e 100755
--- a/keyboards/mnk50/info.json
+++ b/keyboards/mnk50/info.json
@@ -6,7 +6,167 @@
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
8 "LAYOUT_all": { 8 "LAYOUT_all": {
9 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":13, "y":2}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":2.25}, {"x":6.75, "y":3, "w":2.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3}] 9 "layout": [
10 {"x":0, "y":0},
11 {"x":1, "y":0},
12 {"x":2, "y":0},
13 {"x":3, "y":0},
14 {"x":4, "y":0},
15 {"x":5, "y":0},
16 {"x":6, "y":0},
17 {"x":7, "y":0},
18 {"x":8, "y":0},
19 {"x":9, "y":0},
20 {"x":10, "y":0},
21 {"x":11, "y":0},
22 {"x":12, "y":0},
23 {"x":13, "y":0},
24
25 {"x":0, "y":1, "w":1.25},
26 {"x":1.25, "y":1},
27 {"x":2.25, "y":1},
28 {"x":3.25, "y":1},
29 {"x":4.25, "y":1},
30 {"x":5.25, "y":1},
31 {"x":6.25, "y":1},
32 {"x":7.25, "y":1},
33 {"x":8.25, "y":1},
34 {"x":9.25, "y":1},
35 {"x":10.25, "y":1},
36 {"x":11.25, "y":1},
37 {"x":12.25, "y":1, "w":1.75},
38
39 {"x":0, "y":2, "w":1.75},
40 {"x":1.75, "y":2},
41 {"x":2.75, "y":2},
42 {"x":3.75, "y":2},
43 {"x":4.75, "y":2},
44 {"x":5.75, "y":2},
45 {"x":6.75, "y":2},
46 {"x":7.75, "y":2},
47 {"x":8.75, "y":2},
48 {"x":9.75, "y":2},
49 {"x":10.75, "y":2},
50 {"x":11.75, "y":2, "w":1.25},
51 {"x":13, "y":2},
52
53 {"x":1.25, "y":3},
54 {"x":2.25, "y":3, "w":1.25},
55 {"x":3.5, "y":3},
56 {"x":4.5, "y":3, "w":2},
57 {"x":6.5, "y":3},
58 {"x":7.5, "y":3, "w":2},
59 {"x":9.5, "y":3},
60 {"x":10.5, "y":3, "w":1.25},
61 {"x":11.75, "y":3}
62 ]
63 },
64 "LAYOUT_split_space": {
65 "layout": [
66 {"x":0, "y":0},
67 {"x":1, "y":0},
68 {"x":2, "y":0},
69 {"x":3, "y":0},
70 {"x":4, "y":0},
71 {"x":5, "y":0},
72 {"x":6, "y":0},
73 {"x":7, "y":0},
74 {"x":8, "y":0},
75 {"x":9, "y":0},
76 {"x":10, "y":0},
77 {"x":11, "y":0},
78 {"x":12, "y":0},
79 {"x":13, "y":0},
80
81 {"x":0, "y":1, "w":1.25},
82 {"x":1.25, "y":1},
83 {"x":2.25, "y":1},
84 {"x":3.25, "y":1},
85 {"x":4.25, "y":1},
86 {"x":5.25, "y":1},
87 {"x":6.25, "y":1},
88 {"x":7.25, "y":1},
89 {"x":8.25, "y":1},
90 {"x":9.25, "y":1},
91 {"x":10.25, "y":1},
92 {"x":11.25, "y":1},
93 {"x":12.25, "y":1, "w":1.75},
94
95 {"x":0, "y":2, "w":1.75},
96 {"x":1.75, "y":2},
97 {"x":2.75, "y":2},
98 {"x":3.75, "y":2},
99 {"x":4.75, "y":2},
100 {"x":5.75, "y":2},
101 {"x":6.75, "y":2},
102 {"x":7.75, "y":2},
103 {"x":8.75, "y":2},
104 {"x":9.75, "y":2},
105 {"x":10.75, "y":2},
106 {"x":11.75, "y":2, "w":1.25},
107 {"x":13, "y":2},
108
109 {"x":1.25, "y":3},
110 {"x":2.25, "y":3, "w":1.25},
111 {"x":3.5, "y":3},
112 {"x":4.5, "y":3, "w":2.25},
113 {"x":6.75, "y":3, "w":2.75},
114 {"x":9.5, "y":3},
115 {"x":10.5, "y":3, "w":1.25},
116 {"x":11.75, "y":3}
117 ]
118 },
119 "LAYOUT_7u_space": {
120 "layout": [
121 {"x":0, "y":0},
122 {"x":1, "y":0},
123 {"x":2, "y":0},
124 {"x":3, "y":0},
125 {"x":4, "y":0},
126 {"x":5, "y":0},
127 {"x":6, "y":0},
128 {"x":7, "y":0},
129 {"x":8, "y":0},
130 {"x":9, "y":0},
131 {"x":10, "y":0},
132 {"x":11, "y":0},
133 {"x":12, "y":0},
134 {"x":13, "y":0},
135
136 {"x":0, "y":1, "w":1.25},
137 {"x":1.25, "y":1},
138 {"x":2.25, "y":1},
139 {"x":3.25, "y":1},
140 {"x":4.25, "y":1},
141 {"x":5.25, "y":1},
142 {"x":6.25, "y":1},
143 {"x":7.25, "y":1},
144 {"x":8.25, "y":1},
145 {"x":9.25, "y":1},
146 {"x":10.25, "y":1},
147 {"x":11.25, "y":1},
148 {"x":12.25, "y":1, "w":1.75},
149
150 {"x":0, "y":2, "w":1.75},
151 {"x":1.75, "y":2},
152 {"x":2.75, "y":2},
153 {"x":3.75, "y":2},
154 {"x":4.75, "y":2},
155 {"x":5.75, "y":2},
156 {"x":6.75, "y":2},
157 {"x":7.75, "y":2},
158 {"x":8.75, "y":2},
159 {"x":9.75, "y":2},
160 {"x":10.75, "y":2},
161 {"x":11.75, "y":2, "w":1.25},
162 {"x":13, "y":2},
163
164 {"x":1.25, "y":3},
165 {"x":2.25, "y":3, "w":1.25},
166 {"x":3.5, "y":3, "w":7},
167 {"x":10.5, "y":3, "w":1.25},
168 {"x":11.75, "y":3}
169 ]
10 } 170 }
11 } 171 }
12} 172}
diff --git a/keyboards/mnk50/mnk50.h b/keyboards/mnk50/mnk50.h
index 23b892907..594445038 100644
--- a/keyboards/mnk50/mnk50.h
+++ b/keyboards/mnk50/mnk50.h
@@ -19,6 +19,21 @@
19 19
20#include "quantum.h" 20#include "quantum.h"
21 21
22/*
23 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
24 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
25 * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
26 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D │
27 * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤ ┌────────┐
28 * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2B │ 2.25u RShift
29 * └────┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┴───┘ └────────┘
30 * │31 │32 │33 │ 35 │ 37 │39 │3A │3B │
31 * └───┴────┴───┴────────┴──────────┴───┴────┴───┘
32 * ┌───────────────────────────┐
33 * │ 36 │ 7u Spacebar
34 * └───────────────────────────┘
35 */
36
22#define LAYOUT_all( \ 37#define LAYOUT_all( \
23 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 38 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
24 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \ 39 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \
@@ -30,3 +45,27 @@
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ 45 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
31 { XXX, K31, K32, K33, XXX, K35, K36, K37, XXX, K39, K3A, K3B, XXX, XXX } \ 46 { XXX, K31, K32, K33, XXX, K35, K36, K37, XXX, K39, K3A, K3B, XXX, XXX } \
32} 47}
48
49#define LAYOUT_split_space( \
50 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
51 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \
52 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
53 K31, K32, K33, K35, K37, K39, K3A, K3B \
54) { \
55 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
56 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
57 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
58 { XXX, K31, K32, K33, XXX, K35, XXX, K37, XXX, K39, K3A, K3B, XXX, XXX } \
59}
60
61#define LAYOUT_7u_space( \
62 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
63 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \
64 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
65 K31, K32, K36, K3A, K3B \
66) { \
67 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
68 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
69 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
70 { XXX, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, XXX, XXX } \
71}