da9f894341a20c2e4e293cc2e1bb862785a6ccbf
- Author
- Joel Challis <git@zvecr.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Fix issues with adm42 (#22144)
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
2deleted file mode 100644
3index b5ba2eb94eaacb1230b6c9e39bbdaf76fbb4b7a4..0000000000000000000000000000000000000000
4--- a/keyboards/adm42/config.h
5+++ /dev/null
6@@ -1,21 +0,0 @@
7-/* Copyright 2020-2022 Lorenzo Leonini
8- * SPDX-License-Identifier: GPL-2.0-only
9- *
10- * This program is free software: you can redistribute it and/or modify
11- * it under the terms of the GNU General Public License version 2 as
12- * published by the Free Software Foundation.
13- *
14- * This program is distributed in the hope that it will be useful,
15- * but WITHOUT ANY WARRANTY; without even the implied warranty of
16- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17- * GNU General Public License for more details.
18- *
19- * You should have received a copy of the GNU General Public License
20- * along with this program. If not, see <http://www.gnu.org/licenses/>.
21- */
22-
23-#pragma once
24-
25-#if defined(CONSOLE_ENABLE)
26- #define DEBUG_MATRIX_SCAN_RATE
27-#endif
28diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
29deleted file mode 100644
30index b2bdbc4dad0dc1ef0205894efe2fc95bfd99cd27..0000000000000000000000000000000000000000
31--- a/keyboards/adm42/info.json
32+++ /dev/null
33@@ -1,90 +0,0 @@
34-{
35- "keyboard_name": "ADM42",
36- "manufacturer": "Lorenzo Leonini",
37- "url": "https://adm42.dev/",
38- "maintainer": "lleonini",
39- "debounce": 10,
40- "usb": {
41- "vid": "0x04D8",
42- "pid": "0xE873",
43- "device_version": "0.0.1"
44- },
45- "ws2812": {
46- "pin": "B7"
47- },
48- "rgb_matrix": {
49- "driver": "ws2812",
50- "sat_steps": 24
51- },
52- "qmk": {
53- "tap_keycode_delay": 1
54- },
55- "build": {
56- "debounce_type": "sym_eager_pk"
57- },
58- "matrix_pins": {
59- "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
60- "rows": ["C7", "D5", "D3", "D2"]
61- },
62- "diode_direction": "ROW2COL",
63- "processor": "atmega32u4",
64- "bootloader": "atmel-dfu",
65- "layout_aliases": {
66- "LAYOUT_adm42_3x12_6": "LAYOUT"
67- },
68- "layouts": {
69- "LAYOUT": {
70- "layout": [
71- {"matrix": [0, 0], "x": 0, "y": 0.8},
72- {"matrix": [0, 1], "x": 1, "y": 0.8},
73- {"matrix": [0, 2], "x": 2, "y": 0},
74- {"matrix": [0, 3], "x": 3, "y": 0},
75- {"matrix": [0, 4], "x": 4, "y": 0.5},
76- {"matrix": [0, 5], "x": 5, "y": 0.5},
77-
78- {"matrix": [0, 6], "x": 7.5, "y": 0.5},
79- {"matrix": [0, 7], "x": 8.5, "y": 0.5},
80- {"matrix": [0, 8], "x": 9.5, "y": 0},
81- {"matrix": [0, 9], "x": 10.5, "y": 0},
82- {"matrix": [0, 10], "x": 11.5, "y": 0.8},
83- {"matrix": [0, 11], "x": 12.5, "y": 0.8},
84-
85- {"matrix": [1, 0], "x": 0, "y": 1.8},
86- {"matrix": [1, 1], "x": 1, "y": 1.8},
87- {"matrix": [1, 2], "x": 2, "y": 1},
88- {"matrix": [1, 3], "x": 3, "y": 1},
89- {"matrix": [1, 4], "x": 4, "y": 1.5},
90- {"matrix": [1, 5], "x": 5, "y": 1.5},
91-
92- {"matrix": [1, 6], "x": 7.5, "y": 1.5},
93- {"matrix": [1, 7], "x": 8.5, "y": 1.5},
94- {"matrix": [1, 8], "x": 9.5, "y": 1},
95- {"matrix": [1, 9], "x": 10.5, "y": 1},
96- {"matrix": [1, 10], "x": 11.5, "y": 1.8},
97- {"matrix": [1, 11], "x": 12.5, "y": 1.8},
98-
99- {"matrix": [2, 0], "x": 0, "y": 2.8},
100- {"matrix": [2, 1], "x": 1, "y": 2.8},
101- {"matrix": [2, 2], "x": 2, "y": 2},
102- {"matrix": [2, 3], "x": 3, "y": 2},
103- {"matrix": [2, 4], "x": 4, "y": 2.5},
104- {"matrix": [2, 5], "x": 5, "y": 2.5},
105-
106- {"matrix": [2, 6], "x": 7.5, "y": 2.5},
107- {"matrix": [2, 7], "x": 8.5, "y": 2.5},
108- {"matrix": [2, 8], "x": 9.5, "y": 2},
109- {"matrix": [2, 9], "x": 10.5, "y": 2},
110- {"matrix": [2, 10], "x": 11.5, "y": 2.8},
111- {"matrix": [2, 11], "x": 12.5, "y": 2.8},
112-
113- {"matrix": [3, 3], "x": 4.25, "y": 3.55},
114- {"matrix": [3, 4], "x": 5.25, "y": 3.65},
115- {"matrix": [3, 6], "x": 6.25, "y": 1.875, "h": 1.25},
116-
117- {"matrix": [3, 5], "x": 6.25, "y": 4.05},
118- {"matrix": [3, 7], "x": 7.25, "y": 3.65},
119- {"matrix": [3, 8], "x": 8.25, "y": 3.55}
120- ]
121- }
122- }
123-}
124diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
125deleted file mode 100644
126index 5553b18751cc369b67dc4c437855e23f3c05d184..0000000000000000000000000000000000000000
127--- a/keyboards/adm42/rev4/config.h
128+++ /dev/null
129@@ -1,44 +0,0 @@
130-/* Copyright 2020-2022 Lorenzo Leonini
131- * SPDX-License-Identifier: GPL-2.0-only
132- *
133- * This program is free software: you can redistribute it and/or modify
134- * it under the terms of the GNU General Public License version 2 as
135- * published by the Free Software Foundation.
136- *
137- * This program is distributed in the hope that it will be useful,
138- * but WITHOUT ANY WARRANTY; without even the implied warranty of
139- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
140- * GNU General Public License for more details.
141- *
142- * You should have received a copy of the GNU General Public License
143- * along with this program. If not, see <http://www.gnu.org/licenses/>.
144- */
145-
146-#pragma once
147-
148-#define ADM42_LED E6
149-
150-#define RGB_MATRIX_LED_COUNT 42
151-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
152-#define RGB_DISABLE_WHEN_USB_SUSPENDED
153-#define RGB_MATRIX_LED_PROCESS_LIMIT 21
154-#define RGB_MATRIX_LED_FLUSH_LIMIT 16
155-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
156-#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 20
157-#define RGB_MATRIX_KEYPRESSES
158-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
159-
160-#define ENABLE_RGB_MATRIX_BREATHING
161-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
162-#define ENABLE_RGBLIGHT_MODE_STATIC_LIGHT
163-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
164-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
165-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
166-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
167-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
168-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
169-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
170-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
171-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
172-#define ENABLE_RGB_MATRIX_BAND_VAL
173-#define ENABLE_RGB_MATRIX_SPLASH
174diff --git a/keyboards/adm42/rev4/info.json b/keyboards/adm42/rev4/info.json
175new file mode 100644
176index 0000000000000000000000000000000000000000..efb0eea029b2e2bf37f1a27521da25bf8690b9d7
177--- /dev/null
178+++ b/keyboards/adm42/rev4/info.json
179@@ -0,0 +1,163 @@
180+{
181+ "keyboard_name": "ADM42",
182+ "manufacturer": "Lorenzo Leonini",
183+ "url": "https://adm42.dev/",
184+ "maintainer": "lleonini",
185+ "debounce": 10,
186+ "usb": {
187+ "vid": "0x04D8",
188+ "pid": "0xE873",
189+ "device_version": "0.0.1"
190+ },
191+ "features": {
192+ "bootmagic": true,
193+ "command": false,
194+ "console": false,
195+ "extrakey": true,
196+ "mousekey": true,
197+ "nkro": true,
198+ "rgb_matrix": true
199+ },
200+ "ws2812": {
201+ "pin": "B7"
202+ },
203+ "rgb_matrix": {
204+ "driver": "ws2812",
205+ "animations": {
206+ "breathing": true,
207+ "band_val": true,
208+ "cycle_left_right": true,
209+ "cycle_up_down": true,
210+ "cycle_out_in": true,
211+ "cycle_pinwheel": true,
212+ "jellybean_raindrops": true,
213+ "pixel_fractal": true,
214+ "pixel_rain": true,
215+ "typing_heatmap": true,
216+ "digital_rain": true,
217+ "solid_reactive_simple": true,
218+ "splash": true
219+ },
220+ "layout": [
221+ {"matrix": [3, 6], "x": 112, "y": 32, "flags": 4},
222+ {"matrix": [2, 5], "x": 92, "y": 36, "flags": 4},
223+ {"matrix": [1, 5], "x": 94, "y": 25, "flags": 4},
224+ {"matrix": [0, 5], "x": 97, "y": 14, "flags": 4},
225+ {"matrix": [0, 4], "x": 80, "y": 13, "flags": 4},
226+ {"matrix": [1, 4], "x": 77, "y": 24, "flags": 4},
227+ {"matrix": [1, 3], "x": 62, "y": 18, "flags": 4},
228+ {"matrix": [0, 3], "x": 64, "y": 8, "flags": 4},
229+ {"matrix": [0, 2], "x": 49, "y": 6, "flags": 4},
230+ {"matrix": [1, 2], "x": 46, "y": 17, "flags": 4},
231+ {"matrix": [1, 1], "x": 28, "y": 23, "flags": 4},
232+ {"matrix": [0, 1], "x": 30, "y": 13, "flags": 4},
233+ {"matrix": [0, 0], "x": 14, "y": 11, "flags": 4},
234+ {"matrix": [1, 0], "x": 11, "y": 22, "flags": 4},
235+ {"matrix": [2, 0], "x": 8, "y": 32, "flags": 4},
236+ {"matrix": [2, 1], "x": 26, "y": 34, "flags": 4},
237+ {"matrix": [2, 2], "x": 43, "y": 28, "flags": 4},
238+ {"matrix": [2, 3], "x": 61, "y": 29, "flags": 4},
239+ {"matrix": [2, 4], "x": 76, "y": 34, "flags": 4},
240+ {"matrix": [3, 3], "x": 78, "y": 46, "flags": 4},
241+ {"matrix": [3, 4], "x": 97, "y": 49, "flags": 4},
242+ {"matrix": [3, 5], "x": 112, "y": 56, "flags": 4},
243+ {"matrix": [3, 7], "x": 127, "y": 49, "flags": 4},
244+ {"matrix": [3, 8], "x": 146, "y": 46, "flags": 4},
245+ {"matrix": [2, 6], "x": 132, "y": 36, "flags": 4},
246+ {"matrix": [2, 7], "x": 148, "y": 34, "flags": 4},
247+ {"matrix": [2, 8], "x": 164, "y": 29, "flags": 4},
248+ {"matrix": [2, 9], "x": 180, "y": 28, "flags": 4},
249+ {"matrix": [2, 10], "x": 198, "y": 34, "flags": 4},
250+ {"matrix": [2, 11], "x": 215, "y": 32, "flags": 4},
251+ {"matrix": [1, 11], "x": 212, "y": 22, "flags": 4},
252+ {"matrix": [1, 10], "x": 196, "y": 23, "flags": 4},
253+ {"matrix": [1, 9], "x": 178, "y": 17, "flags": 4},
254+ {"matrix": [1, 8], "x": 161, "y": 18, "flags": 4},
255+ {"matrix": [1, 7], "x": 146, "y": 24, "flags": 4},
256+ {"matrix": [1, 6], "x": 130, "y": 25, "flags": 4},
257+ {"matrix": [0, 6], "x": 126, "y": 14, "flags": 4},
258+ {"matrix": [0, 7], "x": 143, "y": 13, "flags": 4},
259+ {"matrix": [0, 8], "x": 159, "y": 8, "flags": 4},
260+ {"matrix": [0, 9], "x": 175, "y": 6, "flags": 4},
261+ {"matrix": [0, 10], "x": 194, "y": 13, "flags": 4},
262+ {"matrix": [0, 11], "x": 210, "y": 11, "flags": 4}
263+ ],
264+ "led_flush_limit": 16,
265+ "led_process_limit": 21,
266+ "max_brightness": 170,
267+ "sat_steps": 24,
268+ "sleep": true
269+ },
270+ "qmk": {
271+ "tap_keycode_delay": 1
272+ },
273+ "build": {
274+ "debounce_type": "sym_eager_pk",
275+ "lto": true
276+ },
277+ "matrix_pins": {
278+ "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
279diff --git a/keyboards/adm42/rev4/keymaps/default/config.h b/keyboards/adm42/rev4/keymaps/default/config.h
280deleted file mode 100644
281index abfaf9af789205940fec86edf973e0e780acc0df..0000000000000000000000000000000000000000
282--- a/keyboards/adm42/rev4/keymaps/default/config.h
283+++ /dev/null
284@@ -1,2 +0,0 @@
285-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
286-#define QUICK_TAP_TERM_PER_KEY
287diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.c b/keyboards/adm42/rev4/keymaps/default/keymap.c
288deleted file mode 100644
289index 12e4e85a4a14da05bc279b6839d09752fc27e513..0000000000000000000000000000000000000000
290--- a/keyboards/adm42/rev4/keymaps/default/keymap.c
291+++ /dev/null
292@@ -1,204 +0,0 @@
293-/* Copyright 2020-2022 Lorenzo Leonini
294- * SPDX-License-Identifier: GPL-2.0-only
295- *
296- * This program is free software: you can redistribute it and/or modify
297- * it under the terms of the GNU General Public License version 2 as
298- * published by the Free Software Foundation.
299- *
300- * This program is distributed in the hope that it will be useful,
301- * but WITHOUT ANY WARRANTY; without even the implied warranty of
302- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
303- * GNU General Public License for more details.
304- *
305- * You should have received a copy of the GNU General Public License
306- * along with this program. If not, see <http://www.gnu.org/licenses/>.
307- */
308-
309-#include QMK_KEYBOARD_H
310-
311-enum custom_layers {
312- _QWERTY,
313- _COLEMAKDH,
314- _SPECIAL,
315- _EXTRA,
316- _ADM,
317- _SETUP,
318-};
319-
320-#define LW_GRV LWIN_T(KC_GRV)
321-#define RW_EQU RWIN_T(KC_EQUAL)
322-#define RW_BS RWIN_T(KC_BSLS)
323-#define LC_TAB LCTL_T(KC_TAB)
324-#define RC_QUT RCTL_T(KC_QUOT)
325-#define LS_BPC LSFT_T(KC_BSPC)
326-#define RS_SPC RSFT_T(KC_SPC)
327-#define LA_BS LALT_T(KC_BSLS)
328-#define LW_F11 LWIN_T(KC_F11)
329-#define LC_APP LCTL_T(KC_APP)
330-#define LA_TOG LALT_T(RGB_TOG)
331-#define RW_F12 RWIN_T(KC_F12)
332-
333-#define LLS_ESC LT(_SPECIAL, KC_ESC)
334-#define LLS_RALT LT(_SPECIAL, KC_RALT)
335-#define LLE_ENT LT(_EXTRA, KC_ENT)
336-#define LLA_DEL LT(_ADM, KC_DEL)
337-#define SETUP MO(_SETUP)
338-
339-enum custom_keycodes {
340- REFLASH = SAFE_RANGE,
341- LC_CIRC,
342- RC_DLR,
343- DF_QWER,
344- DF_COLE,
345-};
346-
347-// Not a mistake to have KC_LALT (also) on the right, RALT is kept for compose (LLS_RALT)
348-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
349- [_QWERTY] = LAYOUT(
350- LW_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, RW_EQU,
351- LC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RC_QUT,
352- KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LALT,
353- LLS_ESC, LS_BPC, LLA_DEL, LLE_ENT, RS_SPC, LLS_RALT
354- ),
355- [_COLEMAKDH] = LAYOUT(
356- LW_GRV, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, RW_EQU,
357- LC_TAB, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, RC_QUT,
358- KC_LALT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_LALT,
359- LLS_ESC, LS_BPC, LLA_DEL, LLE_ENT, RS_SPC, LLS_RALT
360- ),
361-
362- [_SPECIAL] = LAYOUT(
363- _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, RW_BS,
364- LC_CIRC, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_EXLM, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_MINS, RC_DLR,
365- _______, KC_AMPR, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_UNDS, KC_ASTR, KC_HASH, KC_PERC, KC_TILD, _______,
366- KC_ESC, _______, KC_DEL, KC_ENT, _______, KC_RALT
367- ),
368- [_EXTRA] = LAYOUT(
369- LW_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RW_F12,
370- KC_LCTL, KC_PAUS, KC_INS, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_APP, KC_RCTL,
371- _______, KC_SLEP, KC_PWR, KC_MSTP, KC_MNXT, KC_MPLY, _______, KC_BRID, KC_BRIU, KC_PSCR, KC_WAKE, _______,
372- KC_CAPS, _______, _______, _______, _______, KC_CAPS
373- ),
374- [_ADM] = LAYOUT(
375- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_B, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, XXXXXXX,
376- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_HUI, XXXXXXX,
377- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_P, RGB_SPD, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX,
378- XXXXXXX, XXXXXXX, XXXXXXX, SETUP, XXXXXXX, XXXXXXX
379- ),
380- [_SETUP] = LAYOUT(
381- REFLASH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
382- XXXXXXX, DF_QWER, DF_COLE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
383- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR,
384- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
385- ),
386-};
387-
388-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
389- // Special if-condition outside the switch because `RC_QUT` overlaps with
390- // the `QK_MOD_TAP ... QK_MOD_TAP_MAX` range.
391- if (keycode == RC_QUT) {
392diff --git a/keyboards/adm42/rev4/keymaps/default/keymap.json b/keyboards/adm42/rev4/keymaps/default/keymap.json
393new file mode 100644
394index 0000000000000000000000000000000000000000..72eb7d50de476a5a6d4185257b63a0554506964c
395--- /dev/null
396+++ b/keyboards/adm42/rev4/keymaps/default/keymap.json
397@@ -0,0 +1,44 @@
398+{
399+ "keyboard": "adm42/rev4",
400+ "keymap": "default",
401+ "commit": "3bf01bb9ed202b14f78105db2aa2a75d01fc4323",
402+ "layout": "LAYOUT",
403+ "layers": [
404+ [
405+ "LWIN_T(KC_GRV)", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "RWIN_T(KC_EQL)",
406+ "LCTL_T(KC_TAB)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "RCTL_T(KC_QUOT)",
407+ "KC_LALT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_LALT",
408+ "LT(2,KC_ESC)", "LSFT_T(KC_BSPC)", "LT(4,KC_DEL)", "LT(3,KC_ENT)", "RSFT_T(KC_SPC)", "LT(2,KC_RALT)"
409+ ],
410+ [
411+ "LWIN_T(KC_GRV)", "KC_Q", "KC_W", "KC_F", "KC_P", "KC_B", "KC_J", "KC_L", "KC_U", "KC_Y", "KC_SCLN", "RWIN_T(KC_EQL)",
412+ "LCTL_T(KC_TAB)", "KC_A", "KC_R", "KC_S", "KC_T", "KC_G", "KC_M", "KC_N", "KC_E", "KC_I", "KC_O", "RCTL_T(KC_QUOT)",
413+ "KC_LALT", "KC_Z", "KC_X", "KC_C", "KC_D", "KC_V", "KC_K", "KC_H", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_LALT",
414+ "LT(2,KC_ESC)", "LSFT_T(KC_BSPC)", "LT(4,KC_DEL)", "LT(3,KC_ENT)", "RSFT_T(KC_SPC)", "LT(2,KC_RALT)"
415+ ],
416+ [
417+ "_______", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "RWIN_T(KC_BSLS)",
418+ "KC_LCTL", "KC_LBRC", "KC_RBRC", "KC_LPRN", "KC_RPRN", "KC_EXLM", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT", "KC_MINS", "KC_RCTL",
419+ "_______", "KC_AMPR", "KC_AT", "KC_LCBR", "KC_RCBR", "KC_PIPE", "KC_UNDS", "KC_ASTR", "KC_HASH", "KC_PERC", "KC_TILD", "_______",
420+ "KC_ESC", "_______", "KC_DEL", "KC_ENT", "_______", "KC_RALT"
421+ ],
422+ [
423+ "LWIN_T(KC_F11)", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "RWIN_T(KC_F12)",
424+ "KC_LCTL", "KC_PAUS", "KC_INS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END", "KC_APP", "KC_RCTL",
425+ "_______", "KC_SLEP", "KC_PWR", "KC_MSTP", "KC_MNXT", "KC_MPLY", "_______", "KC_BRID", "KC_BRIU", "KC_PSCR", "KC_WAKE", "_______",
426+ "KC_CAPS", "_______", "_______", "_______", "_______", "KC_CAPS"
427+ ],
428+ [
429+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_B", "RGB_VAD", "RGB_VAI", "RGB_SAD", "RGB_SAI", "XXXXXXX",
430+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "RGB_HUD", "RGB_HUI", "XXXXXXX",
431+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "RGB_M_P", "RGB_SPD", "RGB_SPI", "XXXXXXX", "XXXXXXX", "XXXXXXX",
432+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "MO(5)", "XXXXXXX", "XXXXXXX"
433+ ],
434+ [
435+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
436+ "XXXXXXX", "DF(0)", "DF(1)", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
437+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "EE_CLR",
438+ "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX"
439+ ]
440+ ]
441+}
442diff --git a/keyboards/adm42/rev4/rev4.c b/keyboards/adm42/rev4/rev4.c
443deleted file mode 100644
444index 623b5cb5a381d6cef15ccb09376331b52aafbc12..0000000000000000000000000000000000000000
445--- a/keyboards/adm42/rev4/rev4.c
446+++ /dev/null
447@@ -1,39 +0,0 @@
448-/* Copyright 2020-2022 Lorenzo Leonini
449- * SPDX-License-Identifier: GPL-2.0-only
450- *
451- * This program is free software: you can redistribute it and/or modify
452- * it under the terms of the GNU General Public License version 2 as
453- * published by the Free Software Foundation.
454- *
455- * This program is distributed in the hope that it will be useful,
456- * but WITHOUT ANY WARRANTY; without even the implied warranty of
457- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
458- * GNU General Public License for more details.
459- *
460- * You should have received a copy of the GNU General Public License
461- * along with this program. If not, see <http://www.gnu.org/licenses/>.
462- */
463-
464-#include "quantum.h"
465-
466-led_config_t g_led_config = {
467- {
468- {12, 11, 8, 7, 4, 3, 36, 37, 38, 39, 40, 41},
469- {13, 10, 9, 6, 5, 2, 35, 34, 33, 32, 31, 30},
470- {14, 15, 16, 17, 18, 1, 24, 25, 26, 27, 28, 29},
471- {NO_LED, NO_LED, NO_LED, 19, 20, 21, 0, 22, 23, NO_LED, NO_LED, NO_LED}
472- }, {
473- {112, 32}, {92, 36}, {94, 25}, {97, 14}, {80, 13}, {77, 24},
474- {62, 18}, {64, 8}, {49, 6}, {46, 17}, {28, 23}, {30, 13},
475- {14, 11}, {11, 22}, {8, 32}, {26, 34}, {43, 28}, {61, 29},
476- {76, 34}, {78, 46}, {97, 49}, {112, 56}, {127, 49}, {146, 46},
477- {132, 36}, {148, 34}, {164, 29}, {180, 28}, {198, 34}, {215, 32},
478- {212, 22}, {196, 23}, {178, 17}, {161, 18}, {146, 24}, {130, 25},
479- {126, 14}, {143, 13}, {159, 8}, {175, 6}, {194, 13}, {210, 11}
480- }, {
481- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
482- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
483- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
484- 4, 4, 4, 4, 4, 4
485- }
486-};
487diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk
488index aad92997d0fa2f67b5725d6641a85c6e45b27700..6e7633bfe015beed407755e5b0bf5bfed8f67eae 100644
489--- a/keyboards/adm42/rev4/rules.mk
490+++ b/keyboards/adm42/rev4/rules.mk
491@@ -1 +1 @@
492-RGB_MATRIX_ENABLE = yes
493+# This file intentionally left blank
494diff --git a/keyboards/adm42/rules.mk b/keyboards/adm42/rules.mk
495index a2402f19a9b2752fb8c468eae49cd516a34a741d..06fc88e9f6c6c39366aa4552c99684af945efd6e 100644
496--- a/keyboards/adm42/rules.mk
497+++ b/keyboards/adm42/rules.mk
498@@ -1,15 +1 @@
499-# Build Options
500-# change yes to no to disable
501-#
502-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
503-MOUSEKEY_ENABLE = no # Mouse keys
504-EXTRAKEY_ENABLE = yes # Audio control and System control
505-CONSOLE_ENABLE = no # Console for debug
506-COMMAND_ENABLE = no # Commands for debug and configuration
507-NKRO_ENABLE = no # Enable N-Key Rollover
508-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
509-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
510-AUDIO_ENABLE = no # Audio output
511-LTO_ENABLE = yes
512-
513-DEFAULT_FOLDER = adm42/rev4
514+DEFAULT_FOLDER = adm42/rev4