66050bb809b2e173dbcf5ae59f81ed127b193df0
- Author
- Joel Challis <git@zvecr.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Migrate dynamic_keymap.layer_count < 4 where requried (#22091) Co-authored-by: Nick Brassel <nick@tzarc.org>
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h
2index cc05ddf8f17ef266e6362ba1fa58bb3f3183e0be..2ddf1c4393e87289acfe6eac957e281f6da86627 100644
3--- a/keyboards/adpenrose/mine/config.h
4+++ b/keyboards/adpenrose/mine/config.h
5@@ -5,5 +5,3 @@
6
7 /* Solenoid pin */
8 #define SOLENOID_PIN A7
9-
10-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
11diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json
12index 5010485602d0291fd40902a26be548e12a6dfa20..79aceaa3d135ec804af9d5934d48a5f78430f7fb 100644
13--- a/keyboards/adpenrose/mine/info.json
14+++ b/keyboards/adpenrose/mine/info.json
15@@ -15,6 +15,9 @@
16 "build": {
17 "lto": true
18 },
19+ "dynamic_keymap": {
20+ "layer_count": 3
21+ },
22 "encoder": {
23 "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
24 },
25diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h
26index 91e02255699af8b6ff9a0a074452269efd38399a..ff87862693a8e2845263f654650a3bfe48dd2216 100644
27--- a/keyboards/aliceh66/pianoforte/config.h
28+++ b/keyboards/aliceh66/pianoforte/config.h
29@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
30
31 #pragma once
32
33-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
34-
35 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
36 #define LOCKING_SUPPORT_ENABLE
37 /* Locking resynchronize hack */
38 #define LOCKING_RESYNC_ENABLE
39-
40-
41diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h
42index 91e02255699af8b6ff9a0a074452269efd38399a..ff87862693a8e2845263f654650a3bfe48dd2216 100644
43--- a/keyboards/aliceh66/pianoforte_hs/config.h
44+++ b/keyboards/aliceh66/pianoforte_hs/config.h
45@@ -17,11 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46
47 #pragma once
48
49-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
50-
51 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
52 #define LOCKING_SUPPORT_ENABLE
53 /* Locking resynchronize hack */
54 #define LOCKING_RESYNC_ENABLE
55-
56-
57diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
58index 9ae699656b38fc1b98bf57dc47618220bddf48f2..584a6e4bfc50bf689254640980f58760a2094fa3 100644
59--- a/keyboards/basekeys/trifecta/config.h
60+++ b/keyboards/basekeys/trifecta/config.h
61@@ -21,6 +21,3 @@
62
63 /* Locking resynchronize hack */
64 #define LOCKING_RESYNC_ENABLE
65-
66-/* EEPROM for via */
67-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
68diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
69index e89623ec8a037640a62a6b0f63a88b4b43026650..8a895c3e50b5a1070d353f16420628e670dbd226 100644
70--- a/keyboards/bpiphany/frosty_flake/config.h
71+++ b/keyboards/bpiphany/frosty_flake/config.h
72@@ -58,5 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
73 //#define NO_ACTION_LAYER
74 //#define NO_ACTION_TAPPING
75 //#define NO_ACTION_ONESHOT
76-
77-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
78diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
79index 748ad680768b7940f499cf78f4867a9147d6c09a..95fbd477eb53a18806f1a45f87746345a5edb3a1 100644
80--- a/keyboards/bpiphany/frosty_flake/info.json
81+++ b/keyboards/bpiphany/frosty_flake/info.json
82@@ -10,6 +10,9 @@
83 },
84 "processor": "atmega32u2",
85 "bootloader": "atmel-dfu",
86+ "dynamic_keymap": {
87+ "layer_count": 3
88+ },
89 "community_layouts": ["tkl_ansi"],
90 "layouts": {
91 "LAYOUT": {
92diff --git a/keyboards/bpiphany/pegasushoof/2013/config.h b/keyboards/bpiphany/pegasushoof/2013/config.h
93index eb7c2fde1348c2fb93e9fc19c6707e83853e4619..182495aa9b13ec380f645f4bdad5833edcdcb21e 100644
94--- a/keyboards/bpiphany/pegasushoof/2013/config.h
95+++ b/keyboards/bpiphany/pegasushoof/2013/config.h
96@@ -20,5 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
97 /* key matrix size */
98 #define MATRIX_ROWS 8
99 #define MATRIX_COLS 18
100-
101-#define DYNAMIC_KEYMAP_LAYER_COUNT 3 // not enough memory for a 4th layer with VIA
102diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json
103index abbeeb0f36491877c5714d7a33ce64cb2a070a83..c7b120fd05145380efecf0fa0ea630195d638106 100644
104--- a/keyboards/bpiphany/pegasushoof/2013/info.json
105+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
106@@ -1,6 +1,9 @@
107 {
108 "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
109 "diode_direction": "COL2ROW",
110+ "dynamic_keymap": {
111+ "layer_count": 3
112+ },
113 "indicators": {
114 "caps_lock": "C6",
115 "scroll_lock": "C5",
116diff --git a/keyboards/bpiphany/pegasushoof/2015/config.h b/keyboards/bpiphany/pegasushoof/2015/config.h
117index eb7c2fde1348c2fb93e9fc19c6707e83853e4619..182495aa9b13ec380f645f4bdad5833edcdcb21e 100644
118--- a/keyboards/bpiphany/pegasushoof/2015/config.h
119+++ b/keyboards/bpiphany/pegasushoof/2015/config.h
120@@ -20,5 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
121 /* key matrix size */
122 #define MATRIX_ROWS 8
123 #define MATRIX_COLS 18
124-
125-#define DYNAMIC_KEYMAP_LAYER_COUNT 3 // not enough memory for a 4th layer with VIA
126diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
127index a3b5f667844ec09f1a70f21ad12eba410dc0f9df..5c4f8d6f912f127d82873413eb01b5a3f988f7b9 100644
128--- a/keyboards/bpiphany/pegasushoof/2015/info.json
129+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
130@@ -1,6 +1,9 @@
131 {
132 "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
133 "diode_direction": "COL2ROW",
134+ "dynamic_keymap": {
135+ "layer_count": 3
136+ },
137 "indicators": {
138 "caps_lock": "C6",
139 "scroll_lock": "C5",
140diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
141index 0f2582901b1ba9825017d805b3f17dbb3d1da146..4b007cf387ee6a288bd263126612efecfecc4011 100644
142--- a/keyboards/cannonkeys/balance/config.h
143+++ b/keyboards/cannonkeys/balance/config.h
144@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
145 /* Locking resynchronize hack */
146 #define LOCKING_RESYNC_ENABLE
147
148-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
149-
150 /*
151 * Feature disable options
152 * These options are also useful to firmware size reduction.
153diff --git a/keyboards/cannonkeys/brutalv2_1800/config.h b/keyboards/cannonkeys/brutalv2_1800/config.h
154index 9ac66b56248ad2d52e547da4ef5620cff6ab8c12..17bba21f22d8701ef993f88a2a125849bf6ce36c 100644
155--- a/keyboards/cannonkeys/brutalv2_1800/config.h
156+++ b/keyboards/cannonkeys/brutalv2_1800/config.h
157@@ -20,6 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
158 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
159 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
160
161-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
162 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
163-
164diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
165index 3b78decb2778c55202ddaea343258bda2256f9e9..dabdb5ee30e627235050620520553ed12e267362 100644
166--- a/keyboards/cannonkeys/hoodrowg/config.h
167+++ b/keyboards/cannonkeys/hoodrowg/config.h
168@@ -22,9 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
169 /* Locking resynchronize hack */
170 #define LOCKING_RESYNC_ENABLE
171
172-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
173-
174-
175 /*
176 * Feature disable options
177 * These options are also useful to firmware size reduction.
178diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
179index 7f21b3f8a89f6f7be2bf34d33d28d6a40c84ad81..a47b76953a28ccf85ea695a4e6541b345bf6983c 100644
180--- a/keyboards/cannonkeys/rekt1800/config.h
181+++ b/keyboards/cannonkeys/rekt1800/config.h
182@@ -26,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
183 /* Locking resynchronize hack */
184 #define LOCKING_RESYNC_ENABLE
185
186-
187-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
188-
189 /*
190 * Feature disable options
191 * These options are also useful to firmware size reduction.
192diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
193index b8cdc797d0e43d34e1d9c64240dd15d5122c11e7..f3d6237a78df849902d766d10dc0c8f5434aeccf 100644
194--- a/keyboards/cannonkeys/sagittarius/config.h
195+++ b/keyboards/cannonkeys/sagittarius/config.h
196@@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
197 #define WS2812_SPI_SCK_PAL_MODE 0
198 #define WS2812_SPI_SCK_PIN B13
199
200-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
201-
202 /*
203 * Feature disable options
204 * These options are also useful to firmware size reduction.
205diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
206index dcf77ef1ac86a2292512cbffa399141d76f7ee7d..230ff5e311e88537f021d09839b5a4cb0a0c9239 100644
207--- a/keyboards/evyd13/eon95/config.h
208+++ b/keyboards/evyd13/eon95/config.h
209@@ -36,5 +36,3 @@
210 //#define NO_ACTION_LAYER
211 //#define NO_ACTION_TAPPING
212 //#define NO_ACTION_ONESHOT
213-
214-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
215diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
216index 8e2b0a503427aa695b994c52e91240b593d2cf58..c928894dbae4f9a176a595aca6167459d78a3b46 100644
217--- a/keyboards/evyd13/eon95/info.json
218+++ b/keyboards/evyd13/eon95/info.json
219@@ -13,6 +13,9 @@
220 "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
221 },
222 "diode_direction": "COL2ROW",
223+ "dynamic_keymap": {
224+ "layer_count": 3
225+ },
226 "indicators": {
227 "caps_lock": "D5",
228 "num_lock": "B7",
229diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
230index 78bb3b6f80fbb3257aff5fa60abdb08ac0f61945..f64827d05f182fa97e44c4adfecf62939884e211 100644
231--- a/keyboards/evyd13/quackfire/config.h
232+++ b/keyboards/evyd13/quackfire/config.h
233@@ -37,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
234 //#define NO_ACTION_LAYER
235 //#define NO_ACTION_TAPPING
236 //#define NO_ACTION_ONESHOT
237-
238-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
239diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
240index 4f2e248aa52e588b53a9dd1cdc9e266c9ff01a7d..493559b38eefacef58aa4bfa301afe1b369e8968 100644
241--- a/keyboards/evyd13/quackfire/info.json
242+++ b/keyboards/evyd13/quackfire/info.json
243@@ -13,6 +13,9 @@
244 "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"]
245 },
246 "diode_direction": "ROW2COL",
247+ "dynamic_keymap": {
248+ "layer_count": 3
249+ },
250 "indicators": {
251 "caps_lock": "F7",
252 "scroll_lock": "F6",
253diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
254index 78e619874c791a2e62d49723885c7e758db3a84f..8f4df3adf516db61ff83f43b3227411c03421ec2 100644
255--- a/keyboards/evyd13/wasdat/config.h
256+++ b/keyboards/evyd13/wasdat/config.h
257@@ -52,5 +52,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
258 //#define NO_ACTION_LAYER
259 //#define NO_ACTION_TAPPING
260 //#define NO_ACTION_ONESHOT
261-
262-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
263diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
264index f044efff663b8911f28f686246b58356d65e66d6..109e033532fe25670d9205e75b3fffdcf28a7f0b 100644
265--- a/keyboards/evyd13/wasdat/info.json
266+++ b/keyboards/evyd13/wasdat/info.json
267@@ -13,6 +13,9 @@
268 "bootmagic": {
269 "matrix": [0, 5]
270 },
271+ "dynamic_keymap": {
272+ "layer_count": 3
273+ },
274 "qmk_lufa_bootloader": {
275 "esc_output": "D6",
276 "esc_input": "D7",
277diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
278index 085965b814fb22649bc2eed7ef5788aef26e98bf..769751b19d89f8bb9027e762de34f489491bbc19 100644
279--- a/keyboards/evyd13/wasdat_code/config.h
280+++ b/keyboards/evyd13/wasdat_code/config.h
281@@ -58,5 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
282 //#define NO_ACTION_LAYER
283 //#define NO_ACTION_TAPPING
284 //#define NO_ACTION_ONESHOT
285-
286-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
287diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
288index 3841f56cbd6a64b851370dd787df00a3c4f39758..9fb14283ae9ba4d87dc173bb965cdf68aec5e44c 100644
289--- a/keyboards/evyd13/wasdat_code/info.json
290+++ b/keyboards/evyd13/wasdat_code/info.json
291@@ -13,6 +13,9 @@
292 "levels": 5,
293 "breathing": true
294 },
295+ "dynamic_keymap": {
296+ "layer_count": 3
297+ },
298 "qmk_lufa_bootloader": {
299 "esc_input": "F0",
300 "esc_output": "E6",
301diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
302index 776b8ef35fcf70aee266b861eee0004523246949..4937e9e801c4a9828411554f676e29c4706fddd7 100644
303--- a/keyboards/fc980c/config.h
304+++ b/keyboards/fc980c/config.h
305@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
306
307 #pragma once
308
309-
310-/* Maximum dynamic keymap layers (constrained by EEPROM space) */
311-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
312-
313 /* key matrix size */
314 #define MATRIX_ROWS 8
315 #define MATRIX_COLS 16
316diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
317index 27a10b6f51fe4cc078a5c75f22ab32b432f8c09c..5060885c695e15e8d6d193aba80856bbe34f0eff 100644
318--- a/keyboards/fc980c/info.json
319+++ b/keyboards/fc980c/info.json
320@@ -8,6 +8,9 @@
321 "pid": "0x980C",
322 "device_version": "1.0.0"
323 },
324+ "dynamic_keymap": {
325+ "layer_count": 3
326+ },
327 "indicators": {
328 "caps_lock": "B5",
329 "num_lock": "B4",
330diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
331index 64013a3a7fb842e4a8a27e9aaf711f4b9640f0fb..514a1121b35b516b060da790ae0b334e7807d78a 100644
332--- a/keyboards/kabedon/kabedon98e/config.h
333+++ b/keyboards/kabedon/kabedon98e/config.h
334@@ -24,5 +24,3 @@
335 #define LOCKING_SUPPORT_ENABLE
336 /* Locking resynchronize hack */
337 #define LOCKING_RESYNC_ENABLE
338-
339-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
340diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
341index 42f0796a53301d7dfc1a55ee2b4b69e5f105a776..6f99aa6c308ce3f58b9536f51604210d8ed70574 100644
342--- a/keyboards/kabedon/kabedon98e/info.json
343+++ b/keyboards/kabedon/kabedon98e/info.json
344@@ -33,6 +33,9 @@
345 "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"]
346 },
347 "diode_direction": "ROW2COL",
348+ "dynamic_keymap": {
349+ "layer_count": 3
350+ },
351 "encoder": {
352 "rotary": [
353 {"pin_a": "B3", "pin_b": "B5"},
354diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
355index 942207631595f83fe71d90d4e5c528619738386d..6cd365722792f429748637537e36f1e097b3da06 100644
356--- a/keyboards/kapcave/arya/config.h
357+++ b/keyboards/kapcave/arya/config.h
358@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
359 /* Locking resynchronize hack */
360 #define LOCKING_RESYNC_ENABLE
361
362-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
363-
364 /*
365 * Feature disable options
366 * These options are also useful to firmware size reduction.
367diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
368index 92630de5b4736107a70eabfff0dc6809a7cba51b..085db9791c748e0d56dd6ed9f8dfba77faed082c 100644
369--- a/keyboards/kb_elmo/aek2_usb/config.h
370+++ b/keyboards/kb_elmo/aek2_usb/config.h
371@@ -22,6 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
372 /* Locking resynchronize hack */
373 #define LOCKING_RESYNC_ENABLE
374
375-/* reduce EEPROM usage */
376-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
377 #define LAYER_STATE_8BIT
378diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
379index 693f452f20b9cebcc33a84f4a6474ad43cbe85fb..8a091a494c1cb34c0614af51f46ecb69eaab1c12 100644
380--- a/keyboards/kb_elmo/aek2_usb/info.json
381+++ b/keyboards/kb_elmo/aek2_usb/info.json
382@@ -13,6 +13,9 @@
383 "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
384 },
385 "diode_direction": "COL2ROW",
386+ "dynamic_keymap": {
387+ "layer_count": 3
388+ },
389 "indicators": {
390 "caps_lock": "B1",
391 "num_lock": "B2",
392diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
393index 26b629b918ae3cc80553ddff5de0ab02d160b07d..6e726eaae01c3441a877f544d10fa44f55721562 100644
394--- a/keyboards/kbdfans/bella/rgb/config.h
395+++ b/keyboards/kbdfans/bella/rgb/config.h
396@@ -75,4 +75,3 @@
397 #define RGB_MATRIX_LED_COUNT 108
398 #define DRIVER_INDICATOR_LED_TOTAL 0
399 #endif
400-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
401diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
402index d99205c77132983cca2cccf03979256c7ea90920..b53c1f91873c7d8f0c73250a804314780543e195 100644
403--- a/keyboards/kbdfans/bella/rgb_iso/config.h
404+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
405@@ -75,4 +75,3 @@
406 #define RGB_MATRIX_LED_COUNT 109
407 #define DRIVER_INDICATOR_LED_TOTAL 0
408 #endif
409-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
410diff --git a/keyboards/keebio/sinc/rev1/config.h b/keyboards/keebio/sinc/rev1/config.h
411index 2d2c772422885907caf2510cd79ac2cf67690142..e8024190b4bf504f34409381dd2ed415cacd4bf3 100644
412--- a/keyboards/keebio/sinc/rev1/config.h
413+++ b/keyboards/keebio/sinc/rev1/config.h
414@@ -27,4 +27,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
415 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
416
417 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
418-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
419diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
420index 0829cae6e703af8aabba40b209531e5ff1c8f420..b7774fa0edf90d393f6a2efaef7a61695da5a8fa 100644
421--- a/keyboards/keebio/sinc/rev1/info.json
422+++ b/keyboards/keebio/sinc/rev1/info.json
423@@ -7,6 +7,9 @@
424 "processor": "atmega32u4",
425 "bootloader": "atmel-dfu",
426 "diode_direction": "COL2ROW",
427+ "dynamic_keymap": {
428+ "layer_count": 3
429+ },
430 "features": {
431 "rgblight": true,
432 "backlight": true
433diff --git a/keyboards/keebio/sinc/rev2/config.h b/keyboards/keebio/sinc/rev2/config.h
434index 2d2c772422885907caf2510cd79ac2cf67690142..e8024190b4bf504f34409381dd2ed415cacd4bf3 100644
435--- a/keyboards/keebio/sinc/rev2/config.h
436+++ b/keyboards/keebio/sinc/rev2/config.h
437@@ -27,4 +27,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
438 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
439
440 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
441-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
442diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
443index 5b74d17b1ad88a1a7b1bdf99ad256b3b8cdbf4f3..ff5ef2667a00ccdc6020db9026d44fefce2503ca 100644
444--- a/keyboards/keebio/sinc/rev2/info.json
445+++ b/keyboards/keebio/sinc/rev2/info.json
446@@ -7,6 +7,9 @@
447 "processor": "atmega32u4",
448 "bootloader": "atmel-dfu",
449 "diode_direction": "COL2ROW",
450+ "dynamic_keymap": {
451+ "layer_count": 3
452+ },
453 "features": {
454 "rgblight": true,
455 "backlight": true
456diff --git a/keyboards/nopunin10did/jabberwocky/v1/config.h b/keyboards/nopunin10did/jabberwocky/v1/config.h
457index 1eb25da282a62b0e34154233111cdf36b8258a31..ae6256b351bee0da9e09ef7c903709d5ade98f84 100644
458--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
459+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
460@@ -21,6 +21,3 @@
461
462 /* Locking resynchronize hack */
463 #define LOCKING_RESYNC_ENABLE
464-
465-/* Reducing layer count to 3 for via support */
466-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
467diff --git a/keyboards/nopunin10did/jabberwocky/v1/info.json b/keyboards/nopunin10did/jabberwocky/v1/info.json
468index 983b48ab1a94b01ef967586bfa32d7ff8da27f72..59ecc815b0f57310fe72386ea3d7edf26b559c3d 100644
469--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
470+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
471@@ -17,6 +17,9 @@
472 "caps_lock": "B0",
473 "num_lock": "D1"
474 },
475+ "dynamic_keymap": {
476+ "layer_count": 3
477+ },
478 "processor": "atmega32u4",
479 "bootloader": "atmel-dfu",
480 "layouts": {
481diff --git a/keyboards/nopunin10did/jabberwocky/v2/config.h b/keyboards/nopunin10did/jabberwocky/v2/config.h
482index 7be9070afe1fb6fe33fe3699cd65ee55cedccebf..b00b2242dc2cbafbeefb06fabb7fb7d957e293a7 100644
483--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
484+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
485@@ -21,6 +21,3 @@
486
487 /* Locking resynchronize hack */
488 #define LOCKING_RESYNC_ENABLE
489-
490-/* Reducing layer count to 3 for via support */
491-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
492diff --git a/keyboards/nopunin10did/jabberwocky/v2/info.json b/keyboards/nopunin10did/jabberwocky/v2/info.json
493index 64848c0552061389537bb671486944c9ff11d3fa..263ae7df8ff989abd57d59de0fbf10639a8e7d2a 100644
494--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
495+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
496@@ -18,6 +18,9 @@
497 "pin": "D6",
498 "levels": 6
499 },
500+ "dynamic_keymap": {
501+ "layer_count": 3
502+ },
503 "indicators": {
504 "caps_lock": "B7",
505 "num_lock": "C6"
506diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
507index 963f3ea31344091c8e70cc78713333440511bf25..316f8392c0db91b850a0f79b5999ae18e8d188d0 100644
508--- a/keyboards/oddforge/vea/config.h
509+++ b/keyboards/oddforge/vea/config.h
510@@ -24,6 +24,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
511 #define LOCKING_SUPPORT_ENABLE
512 #define LOCKING_RESYNC_ENABLE
513
514-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
515-
516 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
517diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json
518index b5299b1f3e02ad1f946c659bcdb62a7333067540..9b55d0f2b56ce961bcf0bb5f55cc2b7ab58b1889 100644
519--- a/keyboards/oddforge/vea/info.json
520+++ b/keyboards/oddforge/vea/info.json
521@@ -11,6 +11,9 @@
522 "backlight": {
523 "pin": "D4"
524 },
525+ "dynamic_keymap": {
526+ "layer_count": 3
527+ },
528 "rgblight": {
529 "led_count": 18,
530 "sleep": true,
531diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h
532index 08fdfcbc49b403ad4de2a6082b285e1c34100cd9..0ae049312582e6a87d5420784e0f05567815abf0 100644
533--- a/keyboards/teleport/native/config.h
534+++ b/keyboards/teleport/native/config.h
535@@ -14,9 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
536
537 #pragma once
538
539-/* Use 3 dynamic keymap layers */
540-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
541-
542 /* i2C Config */
543 #define I2C_DRIVER I2CD1
544 #define I2C1_SCL_PIN B6
545diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
546index a9909d100165643904baf238881cd683cd1a6048..827133aed36599651c4990f6624e27a2d1fb0a44 100644
547--- a/keyboards/tkc/california/config.h
548+++ b/keyboards/tkc/california/config.h
549@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
550
551 #pragma once
552
553-
554-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
555-
556 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
557 #define LOCKING_SUPPORT_ENABLE
558 /* Locking resynchronize hack */
559diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
560index d309e872f4ee48317f569f22090a5872701c86f2..731e65323ee20fe6e2515e00bb6756180a1e80ed 100644
561--- a/keyboards/tkc/california/info.json
562+++ b/keyboards/tkc/california/info.json
563@@ -17,6 +17,9 @@
564 "pin": "B7",
565 "breathing": true
566 },
567+ "dynamic_keymap": {
568+ "layer_count": 3
569+ },
570 "indicators": {
571 "caps_lock": "F0",
572 "num_lock": "F1"
573diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
574index 5a3bda67c26ad59c35b65dc27bd5072130b9ddf1..ef2f04081f65df89688227ea44a52537704b24f4 100644
575--- a/keyboards/tkc/tkl_ab87/config.h
576+++ b/keyboards/tkc/tkl_ab87/config.h
577@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
578
579 #pragma once
580
581-
582-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
583-
584 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
585 #define LOCKING_SUPPORT_ENABLE
586 /* Locking resynchronize hack */
587diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
588index e01f469285dab2ffc9e524284917152acd88e048..3da58bc5d2dee6c70e952c03f37ac6d0f0694ec9 100644
589--- a/keyboards/wavtype/p01_ultra/config.h
590+++ b/keyboards/wavtype/p01_ultra/config.h
591@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
592 /* Locking resynchronize hack */
593 #define LOCKING_RESYNC_ENABLE
594
595-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
596-
597 /*
598 * Feature disable options
599 * These options are also useful to firmware size reduction.
600diff --git a/keyboards/ydkb/grape/config.h b/keyboards/ydkb/grape/config.h
601index c0bea85abae6f8bba482c5b378a950bd8b0bb59d..a835243d580966c318ef428dc73ac83bd4bd7777 100644
602--- a/keyboards/ydkb/grape/config.h
603+++ b/keyboards/ydkb/grape/config.h
604@@ -28,5 +28,3 @@
605 #define LOCKING_SUPPORT_ENABLE
606 /* Locking resynchronize hack */
607 #define LOCKING_RESYNC_ENABLE
608-
609-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
610diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/info.json
611index 32c9914bdbc1e1c863ccb20e6366604ffd47b79e..75aa8fffafe9c322f0f74fecd22cad33a71cb88e 100644
612--- a/keyboards/ydkb/grape/info.json
613+++ b/keyboards/ydkb/grape/info.json
614@@ -12,6 +12,9 @@
615 "pin": "B7",
616 "breathing": true
617 },
618+ "dynamic_keymap": {
619+ "layer_count": 3
620+ },
621 "rgblight": {
622 "led_count": 4
623 },