diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-10-15 00:00:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-14 17:00:08 -0700 |
commit | 44bfe04f53f7402b1b1934c0353dd70ee3d94a49 (patch) | |
tree | dccaa1856542a0c6f25170054b5a3d58265827bd | |
parent | 943ca36accbb71be38387634caf09667e0e53911 (diff) | |
download | qmk_firmware-44bfe04f53f7402b1b1934c0353dd70ee3d94a49.tar.gz qmk_firmware-44bfe04f53f7402b1b1934c0353dd70ee3d94a49.zip |
[Keyboard] PLX Refactor (#14809)
-rw-r--r-- | keyboards/plx/info.json | 221 | ||||
-rw-r--r-- | keyboards/plx/keymaps/default/keymap.c | 45 | ||||
-rw-r--r-- | keyboards/plx/keymaps/default_all/keymap.c | 45 | ||||
-rw-r--r-- | keyboards/plx/keymaps/via/keymap.c | 44 | ||||
-rw-r--r-- | keyboards/plx/plx.h | 33 | ||||
-rw-r--r-- | keyboards/plx/rules.mk | 2 |
6 files changed, 315 insertions, 75 deletions
diff --git a/keyboards/plx/info.json b/keyboards/plx/info.json index a338f1de2..47f73ada6 100644 --- a/keyboards/plx/info.json +++ b/keyboards/plx/info.json | |||
@@ -1,10 +1,219 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "PLX", | 2 | "keyboard_name": "PLX", |
3 | "url": "https://peac.design/", | 3 | "url": "https://peac.design/", |
4 | "maintainer": "2Moons", | 4 | "maintainer": "2Moons-JP", |
5 | "layout_aliases": { | ||
6 | "LAYOUT": "LAYOUT_60_ansi_tsangan" | ||
7 | }, | ||
5 | "layouts": { | 8 | "layouts": { |
6 | "LAYOUT": { | 9 | "LAYOUT_60_ansi_tsangan": { |
7 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] | 10 | "layout": [ |
11 | {"label":"Esc", "x":0, "y":0}, | ||
12 | {"label":"1!", "x":1, "y":0}, | ||
13 | {"label":"2@", "x":2, "y":0}, | ||
14 | {"label":"3#", "x":3, "y":0}, | ||
15 | {"label":"4$", "x":4, "y":0}, | ||
16 | {"label":"5%", "x":5, "y":0}, | ||
17 | {"label":"6^", "x":6, "y":0}, | ||
18 | {"label":"7&", "x":7, "y":0}, | ||
19 | {"label":"8*", "x":8, "y":0}, | ||
20 | {"label":"9(", "x":9, "y":0}, | ||
21 | {"label":"0)", "x":10, "y":0}, | ||
22 | {"label":"-_", "x":11, "y":0}, | ||
23 | {"label":"=+", "x":12, "y":0}, | ||
24 | {"label":"Backspace", "x":13, "y":0, "w":2}, | ||
25 | |||
26 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
27 | {"label":"Q", "x":1.5, "y":1}, | ||
28 | {"label":"W", "x":2.5, "y":1}, | ||
29 | {"label":"E", "x":3.5, "y":1}, | ||
30 | {"label":"R", "x":4.5, "y":1}, | ||
31 | {"label":"T", "x":5.5, "y":1}, | ||
32 | {"label":"Y", "x":6.5, "y":1}, | ||
33 | {"label":"U", "x":7.5, "y":1}, | ||
34 | {"label":"I", "x":8.5, "y":1}, | ||
35 | {"label":"O", "x":9.5, "y":1}, | ||
36 | {"label":"P", "x":10.5, "y":1}, | ||
37 | {"label":"[{", "x":11.5, "y":1}, | ||
38 | {"label":"]}", "x":12.5, "y":1}, | ||
39 | {"label":"\\|", "x":13.5, "y":1, "w":1.5}, | ||
40 | |||
41 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
42 | {"label":"A", "x":1.75, "y":2}, | ||
43 | {"label":"S", "x":2.75, "y":2}, | ||
44 | {"label":"D", "x":3.75, "y":2}, | ||
45 | {"label":"F", "x":4.75, "y":2}, | ||
46 | {"label":"G", "x":5.75, "y":2}, | ||
47 | {"label":"H", "x":6.75, "y":2}, | ||
48 | {"label":"J", "x":7.75, "y":2}, | ||
49 | {"label":"K", "x":8.75, "y":2}, | ||
50 | {"label":"L", "x":9.75, "y":2}, | ||
51 | {"label":";:", "x":10.75, "y":2}, | ||
52 | {"label":"'\"", "x":11.75, "y":2}, | ||
53 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||
54 | |||
55 | {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||
56 | {"label":"Z", "x":2.25, "y":3}, | ||
57 | {"label":"X", "x":3.25, "y":3}, | ||
58 | {"label":"C", "x":4.25, "y":3}, | ||
59 | {"label":"V", "x":5.25, "y":3}, | ||
60 | {"label":"B", "x":6.25, "y":3}, | ||
61 | {"label":"N", "x":7.25, "y":3}, | ||
62 | {"label":"M", "x":8.25, "y":3}, | ||
63 | {"label":",<", "x":9.25, "y":3}, | ||
64 | {"label":".>", "x":10.25, "y":3}, | ||
65 | {"label":"/?", "x":11.25, "y":3}, | ||
66 | {"label":"Shift", "x":12.25, "y":3, "w":2.75}, | ||
67 | |||
68 | {"label":"Ctrl", "x":0, "y":4, "w":1.5}, | ||
69 | {"label":"Win", "x":1.5, "y":4}, | ||
70 | {"label":"Alt", "x":2.5, "y":4, "w":1.5}, | ||
71 | {"label":"Space", "x":4, "y":4, "w":7}, | ||
72 | {"label":"Alt", "x":11, "y":4, "w":1.5}, | ||
73 | {"label":"Win", "x":12.5, "y":4}, | ||
74 | {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} | ||
75 | ] | ||
76 | }, | ||
77 | "LAYOUT_60_iso_tsangan": { | ||
78 | "layout": [ | ||
79 | {"label":"Esc", "x":0, "y":0}, | ||
80 | {"label":"1!", "x":1, "y":0}, | ||
81 | {"label":"2\"", "x":2, "y":0}, | ||
82 | {"label":"3\u00a3", "x":3, "y":0}, | ||
83 | {"label":"4$", "x":4, "y":0}, | ||
84 | {"label":"5%", "x":5, "y":0}, | ||
85 | {"label":"6^", "x":6, "y":0}, | ||
86 | {"label":"7&", "x":7, "y":0}, | ||
87 | {"label":"8*", "x":8, "y":0}, | ||
88 | {"label":"9(", "x":9, "y":0}, | ||
89 | {"label":"0)", "x":10, "y":0}, | ||
90 | {"label":"-_", "x":11, "y":0}, | ||
91 | {"label":"=+", "x":12, "y":0}, | ||
92 | {"label":"Backspace", "x":13, "y":0, "w":2}, | ||
93 | |||
94 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
95 | {"label":"Q", "x":1.5, "y":1}, | ||
96 | {"label":"W", "x":2.5, "y":1}, | ||
97 | {"label":"E", "x":3.5, "y":1}, | ||
98 | {"label":"R", "x":4.5, "y":1}, | ||
99 | {"label":"T", "x":5.5, "y":1}, | ||
100 | {"label":"Y", "x":6.5, "y":1}, | ||
101 | {"label":"U", "x":7.5, "y":1}, | ||
102 | {"label":"I", "x":8.5, "y":1}, | ||
103 | {"label":"O", "x":9.5, "y":1}, | ||
104 | {"label":"P", "x":10.5, "y":1}, | ||
105 | {"label":"[{", "x":11.5, "y":1}, | ||
106 | {"label":"]}", "x":12.5, "y":1}, | ||
107 | |||
108 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
109 | {"label":"A", "x":1.75, "y":2}, | ||
110 | {"label":"S", "x":2.75, "y":2}, | ||
111 | {"label":"D", "x":3.75, "y":2}, | ||
112 | {"label":"F", "x":4.75, "y":2}, | ||
113 | {"label":"G", "x":5.75, "y":2}, | ||
114 | {"label":"H", "x":6.75, "y":2}, | ||
115 | {"label":"J", "x":7.75, "y":2}, | ||
116 | {"label":"K", "x":8.75, "y":2}, | ||
117 | {"label":"L", "x":9.75, "y":2}, | ||
118 | {"label":";:", "x":10.75, "y":2}, | ||
119 | {"label":"'@", "x":11.75, "y":2}, | ||
120 | {"label":"#~", "x":12.75, "y":2}, | ||
121 | {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, | ||
122 | |||
123 | {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||
124 | {"label":"\\|", "x":1.25, "y":3}, | ||
125 | {"label":"Z", "x":2.25, "y":3}, | ||
126 | {"label":"X", "x":3.25, "y":3}, | ||
127 | {"label":"C", "x":4.25, "y":3}, | ||
128 | {"label":"V", "x":5.25, "y":3}, | ||
129 | {"label":"B", "x":6.25, "y":3}, | ||
130 | {"label":"N", "x":7.25, "y":3}, | ||
131 | {"label":"M", "x":8.25, "y":3}, | ||
132 | {"label":",<", "x":9.25, "y":3}, | ||
133 | {"label":".>", "x":10.25, "y":3}, | ||
134 | {"label":"/?", "x":11.25, "y":3}, | ||
135 | {"label":"Shift", "x":12.25, "y":3, "w":2.75}, | ||
136 | |||
137 | {"label":"Ctrl", "x":0, "y":4, "w":1.5}, | ||
138 | {"label":"Win", "x":1.5, "y":4}, | ||
139 | {"label":"Alt", "x":2.5, "y":4, "w":1.5}, | ||
140 | {"label":"Space", "x":4, "y":4, "w":7}, | ||
141 | {"label":"Alt", "x":11, "y":4, "w":1.5}, | ||
142 | {"label":"Win", "x":12.5, "y":4}, | ||
143 | {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} | ||
144 | ] | ||
145 | }, | ||
146 | "LAYOUT_all": { | ||
147 | "layout": [ | ||
148 | {"label":"Esc", "x":0, "y":0}, | ||
149 | {"label":"1!", "x":1, "y":0}, | ||
150 | {"label":"2@", "x":2, "y":0}, | ||
151 | {"label":"3#", "x":3, "y":0}, | ||
152 | {"label":"4$", "x":4, "y":0}, | ||
153 | {"label":"5%", "x":5, "y":0}, | ||
154 | {"label":"6^", "x":6, "y":0}, | ||
155 | {"label":"7&", "x":7, "y":0}, | ||
156 | {"label":"8*", "x":8, "y":0}, | ||
157 | {"label":"9(", "x":9, "y":0}, | ||
158 | {"label":"0)", "x":10, "y":0}, | ||
159 | {"label":"-_", "x":11, "y":0}, | ||
160 | {"label":"=+", "x":12, "y":0}, | ||
161 | {"label":"Backspace", "x":13, "y":0}, | ||
162 | {"label":"Backspace", "x":14, "y":0}, | ||
163 | |||
164 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
165 | {"label":"Q", "x":1.5, "y":1}, | ||
166 | {"label":"W", "x":2.5, "y":1}, | ||
167 | {"label":"E", "x":3.5, "y":1}, | ||
168 | {"label":"R", "x":4.5, "y":1}, | ||
169 | {"label":"T", "x":5.5, "y":1}, | ||
170 | {"label":"Y", "x":6.5, "y":1}, | ||
171 | {"label":"U", "x":7.5, "y":1}, | ||
172 | {"label":"I", "x":8.5, "y":1}, | ||
173 | {"label":"O", "x":9.5, "y":1}, | ||
174 | {"label":"P", "x":10.5, "y":1}, | ||
175 | {"label":"[{", "x":11.5, "y":1}, | ||
176 | {"label":"]}", "x":12.5, "y":1}, | ||
177 | {"label":"\\|", "x":13.5, "y":1, "w":1.5}, | ||
178 | |||
179 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
180 | {"label":"A", "x":1.75, "y":2}, | ||
181 | {"label":"S", "x":2.75, "y":2}, | ||
182 | {"label":"D", "x":3.75, "y":2}, | ||
183 | {"label":"F", "x":4.75, "y":2}, | ||
184 | {"label":"G", "x":5.75, "y":2}, | ||
185 | {"label":"H", "x":6.75, "y":2}, | ||
186 | {"label":"J", "x":7.75, "y":2}, | ||
187 | {"label":"K", "x":8.75, "y":2}, | ||
188 | {"label":"L", "x":9.75, "y":2}, | ||
189 | {"label":";:", "x":10.75, "y":2}, | ||
190 | {"label":"'\"", "x":11.75, "y":2}, | ||
191 | {"label":"#~", "x":12.75, "y":2}, | ||
192 | {"label":"Enter", "x":13.75, "y":2, "w":1.25}, | ||
193 | |||
194 | {"label":"Shift", "x":0, "y":3, "w":1.25}, | ||
195 | {"label":"\\|", "x":1.25, "y":3}, | ||
196 | {"label":"Z", "x":2.25, "y":3}, | ||
197 | {"label":"X", "x":3.25, "y":3}, | ||
198 | {"label":"C", "x":4.25, "y":3}, | ||
199 | {"label":"V", "x":5.25, "y":3}, | ||
200 | {"label":"B", "x":6.25, "y":3}, | ||
201 | {"label":"N", "x":7.25, "y":3}, | ||
202 | {"label":"M", "x":8.25, "y":3}, | ||
203 | {"label":",<", "x":9.25, "y":3}, | ||
204 | {"label":".>", "x":10.25, "y":3}, | ||
205 | {"label":"/?", "x":11.25, "y":3}, | ||
206 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
207 | {"label":"Fn", "x":14, "y":3}, | ||
208 | |||
209 | {"label":"Ctrl", "x":0, "y":4, "w":1.5}, | ||
210 | {"label":"Win", "x":1.5, "y":4}, | ||
211 | {"label":"Alt", "x":2.5, "y":4, "w":1.5}, | ||
212 | {"label":"Space", "x":4, "y":4, "w":7}, | ||
213 | {"label":"Alt", "x":11, "y":4, "w":1.5}, | ||
214 | {"label":"Win", "x":12.5, "y":4}, | ||
215 | {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} | ||
216 | ] | ||
8 | } | 217 | } |
9 | } | 218 | } |
10 | } \ No newline at end of file | 219 | } |
diff --git a/keyboards/plx/keymaps/default/keymap.c b/keyboards/plx/keymaps/default/keymap.c index 9702b27bd..31273405f 100644 --- a/keyboards/plx/keymaps/default/keymap.c +++ b/keyboards/plx/keymaps/default/keymap.c | |||
@@ -20,30 +20,31 @@ | |||
20 | enum layer_names { | 20 | enum layer_names { |
21 | _BASE, | 21 | _BASE, |
22 | _FN, | 22 | _FN, |
23 | _MEDIA }; | 23 | _MEDIA |
24 | }; | ||
24 | 25 | ||
25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
26 | [_BASE] = LAYOUT( | 27 | [_BASE] = LAYOUT_60_ansi_tsangan( |
27 | KC_ESC, 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, | 28 | KC_ESC, 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, |
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, | 29 | 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, |
29 | 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, | 30 | 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, |
30 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | 31 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
31 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL | 32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL |
32 | ), | 33 | ), |
33 | 34 | ||
34 | [_FN] = LAYOUT( | 35 | [_FN] = LAYOUT_60_ansi_tsangan( |
35 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, | 36 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, |
36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
39 | _______, _______, _______, _______, _______, _______, _______ | 40 | _______, _______, _______, _______, _______, _______, _______ |
40 | ), | 41 | ), |
41 | 42 | ||
42 | [_MEDIA] = LAYOUT( | 43 | [_MEDIA] = LAYOUT_60_ansi_tsangan( |
43 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, | 44 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, |
44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
47 | _______, _______, _______, _______, _______, _______, _______ | 48 | _______, _______, _______, _______, _______, _______, _______ |
48 | ) | 49 | ) |
49 | }; | 50 | }; |
diff --git a/keyboards/plx/keymaps/default_all/keymap.c b/keyboards/plx/keymaps/default_all/keymap.c index 40350c475..cf460e523 100644 --- a/keyboards/plx/keymaps/default_all/keymap.c +++ b/keyboards/plx/keymaps/default_all/keymap.c | |||
@@ -20,30 +20,31 @@ | |||
20 | enum layer_names { | 20 | enum layer_names { |
21 | _BASE, | 21 | _BASE, |
22 | _FN, | 22 | _FN, |
23 | _MEDIA }; | 23 | _MEDIA |
24 | }; | ||
24 | 25 | ||
25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
26 | [_BASE] = LAYOUT( | 27 | [_BASE] = LAYOUT_all( |
27 | KC_ESC, 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_HOME, | 28 | KC_ESC, 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_HOME, |
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, | 29 | 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, |
29 | 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_BSLS, KC_ENT, | 30 | 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_BSLS, KC_ENT, |
30 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), | 31 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), |
31 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL | 32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL |
32 | ), | 33 | ), |
33 | 34 | ||
34 | [_FN] = LAYOUT( | 35 | [_FN] = LAYOUT_all( |
35 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 36 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
39 | _______, _______, _______, _______, _______, _______, _______ | 40 | _______, _______, _______, _______, _______, _______, _______ |
40 | ), | 41 | ), |
41 | 42 | ||
42 | [_MEDIA] = LAYOUT( | 43 | [_MEDIA] = LAYOUT_all( |
43 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 44 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
47 | _______, _______, _______, _______, _______, _______, _______ | 48 | _______, _______, _______, _______, _______, _______, _______ |
48 | ) | 49 | ) |
49 | }; | 50 | }; |
diff --git a/keyboards/plx/keymaps/via/keymap.c b/keyboards/plx/keymaps/via/keymap.c index e988833c2..cf460e523 100644 --- a/keyboards/plx/keymaps/via/keymap.c +++ b/keyboards/plx/keymaps/via/keymap.c | |||
@@ -20,31 +20,31 @@ | |||
20 | enum layer_names { | 20 | enum layer_names { |
21 | _BASE, | 21 | _BASE, |
22 | _FN, | 22 | _FN, |
23 | _MEDIA, | 23 | _MEDIA |
24 | }; | 24 | }; |
25 | 25 | ||
26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 26 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
27 | [_BASE] = LAYOUT_all( | 27 | [_BASE] = LAYOUT_all( |
28 | KC_ESC, 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_HOME, | 28 | KC_ESC, 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_HOME, |
29 | 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, | 29 | 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, |
30 | 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_BSLS, KC_ENT, | 30 | 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_BSLS, KC_ENT, |
31 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), | 31 | KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), |
32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL | 32 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL |
33 | ), | 33 | ), |
34 | 34 | ||
35 | [_FN] = LAYOUT_all( | 35 | [_FN] = LAYOUT_all( |
36 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 36 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
40 | _______, _______, _______, _______, _______, _______, _______ | 40 | _______, _______, _______, _______, _______, _______, _______ |
41 | ), | 41 | ), |
42 | 42 | ||
43 | [_MEDIA] = LAYOUT_all( | 43 | [_MEDIA] = LAYOUT_all( |
44 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, | 44 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, |
45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
48 | _______, _______, _______, _______, _______, _______, _______ | 48 | _______, _______, _______, _______, _______, _______, _______ |
49 | ) | 49 | ) |
50 | }; | 50 | }; |
diff --git a/keyboards/plx/plx.h b/keyboards/plx/plx.h index 9776905f8..22d7bd021 100644 --- a/keyboards/plx/plx.h +++ b/keyboards/plx/plx.h | |||
@@ -17,7 +17,21 @@ | |||
17 | 17 | ||
18 | #include "quantum.h" | 18 | #include "quantum.h" |
19 | 19 | ||
20 | #define XXX KC_NO//readabilty | 20 | #define XXX KC_NO // readability |
21 | |||
22 | /* | ||
23 | * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ | ||
24 | * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace | ||
25 | * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤ | ||
26 | * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │ │ | ||
27 | * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter | ||
28 | * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │ | ||
29 | * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─┴───┴────┤ | ||
30 | * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │3C │ 2.75u RShift | ||
31 | * └────────┘ ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ └──────────┘ | ||
32 | * │40 │41 │42 │46 │4B │4C │4D │ | ||
33 | * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ | ||
34 | */ | ||
21 | 35 | ||
22 | /* This a shortcut to help you visually see your layout. | 36 | /* This a shortcut to help you visually see your layout. |
23 | * | 37 | * |
@@ -27,7 +41,7 @@ | |||
27 | * The second converts the arguments into a two-dimensional array which | 41 | * The second converts the arguments into a two-dimensional array which |
28 | * represents the switch matrix. | 42 | * represents the switch matrix. |
29 | */ | 43 | */ |
30 | #define LAYOUT( \ | 44 | #define LAYOUT_60_ansi_tsangan( \ |
31 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ | 45 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ |
32 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ | 46 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ |
33 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ | 47 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ |
@@ -42,6 +56,21 @@ | |||
42 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D} \ | 56 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D} \ |
43 | } | 57 | } |
44 | 58 | ||
59 | #define LAYOUT_60_iso_tsangan( \ | ||
60 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ | ||
61 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ | ||
62 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ | ||
63 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ | ||
64 | k40, k41, k42, k46, k4B, k4C, k4D \ | ||
65 | ) \ | ||
66 | { \ | ||
67 | { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX}, \ | ||
68 | { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX}, \ | ||
69 | { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D}, \ | ||
70 | { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX}, \ | ||
71 | { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D} \ | ||
72 | } | ||
73 | |||
45 | #define LAYOUT_all( \ | 74 | #define LAYOUT_all( \ |
46 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ | 75 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ |
47 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ | 76 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ |
diff --git a/keyboards/plx/rules.mk b/keyboards/plx/rules.mk index a3ee66575..419033f64 100644 --- a/keyboards/plx/rules.mk +++ b/keyboards/plx/rules.mk | |||
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu | |||
7 | # Build Options | 7 | # Build Options |
8 | # change yes to no to disable | 8 | # change yes to no to disable |
9 | # | 9 | # |
10 | BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
11 | MOUSEKEY_ENABLE = no # Mouse keys | 11 | MOUSEKEY_ENABLE = no # Mouse keys |
12 | EXTRAKEY_ENABLE = no # Audio control and System control | 12 | EXTRAKEY_ENABLE = no # Audio control and System control |
13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |