9b393700d2fdd4a1159ba265bc399726e92f4e60
- Author
- MechMerlin <30334081+mechmerlin@users.noreply.github.com>
- Committer
- Drashna Jaelre <drashna@live.com>
- Date
Message
[Keyboard] Waldo 60 PCB Refactor (#5583) * use pragma once * modified readme with maintainer info * remove rev1 for the time being * QMK Configurator support for 60_ansi and 60_ansi_split_bs_rshift * add hhkb layout and QMK Configurator support * fix compile issue due to missing DEVICE_VER * use a saner and less complicated default layout * remove unused file * fix up LAYOUT_all and formatting along with QKM Configurator support * turn on bootmagic lite as the hardware reset switch isn't in a standard position * remove default folder
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
2index 4f7699ace4a68bf03dafdc48392f2d0dca80a77a..c460e7c2740844f0d7c281860bd3a42e7114cc6b 100644
3--- a/keyboards/waldo/config.h
4+++ b/keyboards/waldo/config.h
5@@ -15,18 +15,17 @@ You should have received a copy of the GNU General Public License
6 along with this program. If not, see <http://www.gnu.org/licenses/>.
7 */
8
9-#ifndef CONFIG_H
10-#define CONFIG_H
11+#pragma once
12
13 #include "config_common.h"
14
15 /* USB Device descriptor parameter */
16 #define VENDOR_ID 0xFEED
17 #define PRODUCT_ID 0x6060
18+#define DEVICE_VER 0x0001
19 #define MANUFACTURER Greenwald Designs
20 #define PRODUCT Waldo
21 #define DESCRIPTION A 60% board
22-
23 /* key matrix size */
24 #define MATRIX_ROWS 5
25 #define MATRIX_COLS 15
26@@ -76,5 +75,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27 // RGB LED
28 #define RGB_DI_PIN B0 // The pin the LED strip is connected to
29 #define RGBLED_NUM 10 // Number of LEDs in your strip
30-
31-#endif
32diff --git a/keyboards/waldo/info.json b/keyboards/waldo/info.json
33new file mode 100644
34index 0000000000000000000000000000000000000000..5cdc12d5ef538e50432126f5e8f1fd214f6d0d2b
35--- /dev/null
36+++ b/keyboards/waldo/info.json
37@@ -0,0 +1,24 @@
38+{
39+ "keyboard_name": "",
40+ "url": "",
41+ "maintainer": "qmk",
42+ "width": 15,
43+ "height": 5,
44+ "layouts": {
45+ "LAYOUT_all": {
46diff --git a/keyboards/waldo/keymaps/default/config.h b/keyboards/waldo/keymaps/default/config.h
47deleted file mode 100644
48index 19a485296eb03308c9702972848ab04e9438d32d..0000000000000000000000000000000000000000
49--- a/keyboards/waldo/keymaps/default/config.h
50+++ /dev/null
51@@ -1,5 +0,0 @@
52-#ifndef CONFIG_USER_H
53-#define CONFIG_USER_H
54-
55-
56-#endif
57diff --git a/keyboards/waldo/keymaps/default/keymap.c b/keyboards/waldo/keymaps/default/keymap.c
58index 8a9aa15410a22237ad8575a1b0d48fdc1b5ae0a4..2fcb3a1afbcf93a2e085e4a53bfbc257a0d2f638 100644
59--- a/keyboards/waldo/keymaps/default/keymap.c
60+++ b/keyboards/waldo/keymaps/default/keymap.c
61@@ -19,130 +19,26 @@
62 extern keymap_config_t keymap_config;
63
64 enum waldo_layers {
65- _QWERTY,
66- _COLEMAK,
67- _DVORAK,
68+ _BASE,
69 _FUNCTION
70 };
71
72-enum waldo_keycodes {
73- QWERTY = SAFE_RANGE,
74- COLEMAK,
75- DVORAK,
76- BACKLIT
77-};
78-
79 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
80
81-/* Qwerty
82- * ,------------------------------------------------------------------------------------------.
83- * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Backspace |
84- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
85- * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ |
86- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
87- * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
88- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
89- * | L Shift | Z | X | C | V | B | N | M | , | . | / | R Shift |
90- * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
91- * | Ctrl | GUI | Alt | Space | Alt | GUI | Menu | Ctrl |
92- * `------------------------------------------------------------------------------------------'
93- */
94-
95-[_QWERTY] = LAYOUT_60_ansi( \
96- 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, \
97- 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, \
98- 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, \
99- RGB_TOG, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
100- BACKLIT, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_F, KC_RCTL \
101-),
102-
103-/* Colemak
104- * ,-----------------------------------------------------------------------------------.
105- * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp |
106- * |------+------+------+------+------+-------------+------+------+------+------+------|
107- * | Esc | A | R | S | T | D | H | N | E | I | O | " |
108- * |------+------+------+------+------+------|------+------+------+------+------+------|
109- * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter |
110- * |------+------+------+------+------+------+------+------+------+------+------+------|
111- * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
112- * `-----------------------------------------------------------------------------------'
113- */
114-[_COLEMAK] = LAYOUT_60_ansi( \
115- 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, \
116- 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, \
117- 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, \
118- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
119- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL \
120-),
121-
122-/* Dvorak
123- * ,-----------------------------------------------------------------------------------.
124- * | Tab | " | , | . | P | Y | F | G | C | R | L | Bksp |
125- * |------+------+------+------+------+-------------+------+------+------+------+------|
126- * | Esc | A | O | E | U | I | D | H | T | N | S | / |
127- * |------+------+------+------+------+------|------+------+------+------+------+------|
128- * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter |
129- * |------+------+------+------+------+------+------+------+------+------+------+------|
130- * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
131- * `-----------------------------------------------------------------------------------'
132- */
133-[_DVORAK] = LAYOUT_60_ansi( \
134- 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, \
135- 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, \
136- 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, \
137- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
138- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL \
139-),
140-
141-/* Lower
142- * ,-----------------------------------------------------------------------------------.
143- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
144- * |------+------+------+------+------+-------------+------+------+------+------+------|
145- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
146- * |------+------+------+------+------+------|------+------+------+------+------+------|
147- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | |
148- * |------+------+------+------+------+------+------+------+------+------+------+------|
149- * | | | | | | | | Next | Vol- | Vol+ | Play |
150- * `-----------------------------------------------------------------------------------'
151- */
152-[_FUNCTION] = LAYOUT_60_ansi( \
153- 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, \
154- 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, \
155- 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, \
156- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
157- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL \
158-)
159+ [_BASE] = LAYOUT_60_ansi( \
160+ 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, \
161diff --git a/keyboards/waldo/readme.md b/keyboards/waldo/readme.md
162index 7bc5c8825647e8e18871ba8f675cec7e76449b64..987b1fa4973f0294c843d4ea03095e4cdd48ee32 100644
163--- a/keyboards/waldo/readme.md
164+++ b/keyboards/waldo/readme.md
165@@ -1,13 +1,12 @@
166-Waldo
167-===
168+# Waldo
169
170 A 60% Keyboard for use in the Holz case by Greenwald Designs
171
172-Keyboard Maintainer: TODO
173-Hardware Availability: TODO
174+Keyboard Maintainer: [That-Canadian](https://github.com/that-canadian)
175+Hardware Availability: https://store.projectkeyboard.com/products/waldo-pcb-60
176
177 Make example for this keyboard (after setting up your build environment):
178
179- make waldo/rev1:default
180+ make waldo:default
181
182diff --git a/keyboards/waldo/rev1/config.h b/keyboards/waldo/rev1/config.h
183deleted file mode 100644
184index adf65403654b91af729de6b5f3dc902a4c73cd3c..0000000000000000000000000000000000000000
185--- a/keyboards/waldo/rev1/config.h
186+++ /dev/null
187@@ -1,7 +0,0 @@
188-#ifndef REV5_CONFIG_H
189-#define REV5_CONFIG_H
190-
191-
192-#define DEVICE_VER 0x0005
193-
194-#endif
195diff --git a/keyboards/waldo/rev1/info.json b/keyboards/waldo/rev1/info.json
196deleted file mode 100644
197index 3d984961ae480809e960d47f60e60a127937548e..0000000000000000000000000000000000000000
198--- a/keyboards/waldo/rev1/info.json
199+++ /dev/null
200@@ -1,3 +0,0 @@
201-{
202- "identifier": "FEED:6060:0005"
203-}
204diff --git a/keyboards/waldo/rev1/rules.mk b/keyboards/waldo/rev1/rules.mk
205deleted file mode 100644
206index 7e64e7edc4f56566c251708b608476105ccf53c2..0000000000000000000000000000000000000000
207--- a/keyboards/waldo/rev1/rules.mk
208+++ /dev/null
209@@ -1 +0,0 @@
210-AUDIO_ENABLE = yes # Audio output on port C6
211diff --git a/keyboards/waldo/rules.mk b/keyboards/waldo/rules.mk
212index c21ed90137616c7b58a2042b5c77a372012a27af..40ac48474eda6eb7111f59557da77a057e53150f 100644
213--- a/keyboards/waldo/rules.mk
214+++ b/keyboards/waldo/rules.mk
215@@ -47,14 +47,14 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
216 # change to "no" to disable the options, or define them in the Makefile in
217 # the appropriate keymap folder that will get included automatically
218 #
219-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
220+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
221 MOUSEKEY_ENABLE = no # Mouse keys(+4700)
222 EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
223 CONSOLE_ENABLE = yes # Console for debug(+400)
224 COMMAND_ENABLE = no # Commands for debug and configuration
225 NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
226 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
227-MIDI_ENABLE = no # MIDI controls
228+MIDI_ENABLE = no # MIDI controls
229 AUDIO_ENABLE = no # Audio output on port C6
230 UNICODE_ENABLE = no # Unicode
231 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
232@@ -63,5 +63,3 @@ API_SYSEX_ENABLE = no
233
234 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
235 SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
236-
237-DEFAULT_FOLDER = waldo/rev1
238diff --git a/keyboards/waldo/waldo.h b/keyboards/waldo/waldo.h
239index 0e1801c9022782a211926cc29db9e0405ab7edc5..f683ca82ff0d145df5bb09f4a3ee0f080873d22e 100644
240--- a/keyboards/waldo/waldo.h
241+++ b/keyboards/waldo/waldo.h
242@@ -1,51 +1,63 @@
243-#ifndef WALDO_H
244-#define WALDO_H
245+#pragma once
246
247 #include "quantum.h"
248
249 #define LAYOUT_60_ansi( \
250 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
251 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
252- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
253- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
254- k40, k41, k42, k46, k49, k4a, k4c, k4d \
255+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
256+ k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \
257+ k40, k41, k42, k46, k49, k4a, k4c, k4d \
258 ) \
259 { \
260 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, KC_NO }, \
261 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
262 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
263 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, KC_NO }, \
264- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
265+ { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
266+}
267+
268+#define LAYOUT_60_hhkb( \
269+ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
270+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
271+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
272+ k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
273+ k41, k42, k46, k49, k4a \
274+) \
275+{ \
276+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
277+ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
278+ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
279+ { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
280+ { KC_NO, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, KC_NO, KC_NO, C_NO } \
281 }
282
283 #define LAYOUT_60_ansi_split_bs_rshift( \
284 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
285- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
286- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
287- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
288- k40, k41, k42, k46, k49, k4a, k4c, k4d \
289+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
290+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
291+ k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
292+ k40, k41, k42, k46, k49, k4a, k4c, k4d \
293 ) \
294 { \
295- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
296+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
297 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
298 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, KC_NO, k2d, KC_NO }, \
299 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
300- { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
301+ { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, k4d, KC_NO } \
302 }
303
304 #define LAYOUT_all( \
305 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
306- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
307- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
308- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
309- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e \
310+ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
311+ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
312+ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
313+ k40, k41, k42, k44, k46, k48, k49, k4a, k4c, k4d \
314 ) \
315 { \
316- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
317- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
318- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
319- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
320- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e } \
321+ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
322+ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \
323+ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
324+ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
325+ { k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, KC_NO, k4c, k4d } \
326 }
327-
328-#endif