From 9a4c30774089b1e0d65e32f86777c69f4f1a313e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 20 Sep 2023 14:11:33 +0100 Subject: [PATCH] Migrate dynamic_keymap.layer_count >= 4 (#22087) --- keyboards/1upkeyboards/pi60/config.h | 2 -- keyboards/1upkeyboards/pi60/info.json | 3 +++ keyboards/1upkeyboards/pi60_hse/config.h | 2 -- keyboards/1upkeyboards/pi60_hse/info.json | 3 +++ keyboards/1upkeyboards/sweet16v2/kb2040/config.h | 2 -- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 3 +++ keyboards/1upkeyboards/sweet16v2/pro_micro/config.h | 3 --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 3 +++ keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 3 +++ keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 3 +++ keyboards/akko/5108/config.h | 3 --- keyboards/akko/5108/info.json | 3 +++ keyboards/akko/acr87/config.h | 3 --- keyboards/akko/acr87/info.json | 3 +++ keyboards/akko/top40/config.h | 3 --- keyboards/akko/top40/info.json | 3 +++ keyboards/bemeier/bmek/config.h | 2 -- keyboards/bemeier/bmek/info.json | 3 +++ keyboards/chosfox/cf81/config.h | 3 --- keyboards/deng/thirty/config.h | 5 ----- keyboards/deng/thirty/info.json | 3 +++ keyboards/dm9records/lain/config.h | 2 -- keyboards/dm9records/lain/info.json | 3 +++ keyboards/doio/kb30/config.h | 3 --- keyboards/gkeyboard/gpad8_2r/config.h | 2 -- keyboards/gkeyboard/gpad8_2r/info.json | 3 +++ keyboards/idyllic/tinny50_rgb/config.h | 3 --- keyboards/idyllic/tinny50_rgb/info.json | 3 +++ keyboards/jones/v1/config.h | 5 ----- keyboards/jones/v1/info.json | 3 +++ keyboards/mechwild/sugarglider/config.h | 2 -- keyboards/mechwild/sugarglider/info.json | 3 +++ keyboards/monsgeek/m1/config.h | 3 --- keyboards/monsgeek/m1/info.json | 3 +++ keyboards/monsgeek/m5/config.h | 3 --- keyboards/monsgeek/m5/info.json | 3 +++ keyboards/monsgeek/m6/config.h | 3 --- keyboards/monsgeek/m6/info.json | 3 +++ keyboards/moonlander/config.h | 4 ---- keyboards/moonlander/info.json | 3 +++ keyboards/primekb/prime_e/config.h | 2 -- keyboards/primekb/prime_e/info.json | 3 +++ keyboards/pteron36/config.h | 3 --- keyboards/pteron36/info.json | 3 +++ keyboards/qvex/lynepad2/config.h | 2 -- keyboards/qvex/lynepad2/info.json | 3 +++ keyboards/sirius/uni660/rev1/config.h | 2 -- keyboards/sirius/uni660/rev2/ansi/config.h | 2 -- keyboards/sirius/uni660/rev2/iso/config.h | 2 -- keyboards/wilba_tech/rama_works_m10_b/config.h | 2 -- keyboards/wilba_tech/rama_works_m10_b/info.json | 3 +++ keyboards/wilba_tech/rama_works_m10_c/config.h | 2 -- keyboards/wilba_tech/rama_works_m10_c/info.json | 3 +++ keyboards/zykrah/fuyu/config.h | 2 -- keyboards/zykrah/fuyu/info.json | 3 +++ keyboards/zykrah/slime88/config.h | 2 -- keyboards/zykrah/slime88/info.json | 3 +++ 59 files changed, 81 insertions(+), 85 deletions(-) diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h index 8940acb0041f610820baa3131b7da5b47330d47a..6bbbb2293c0beb760e0e9a9aaf4d60c81af8e0f1 100644 --- a/keyboards/1upkeyboards/pi60/config.h +++ b/keyboards/1upkeyboards/pi60/config.h @@ -3,8 +3,6 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 - #define RGB_MATRIX_LED_COUNT 21 //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS //#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index 2d3797c1a8da6078a33b46bf763feb6674a90a3f..4d0d21ea250aa641caeb44bf084a6ed6b2eb1b32 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -11,6 +11,9 @@ "vid": "0x6F75" }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "features": { "audio": false, "backlight": false, diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h index a47120f7d39a8acea13b95b13817c714e85ec32d..b7c4d5e8bc8734c42e280c92c56d73106c9b9245 100644 --- a/keyboards/1upkeyboards/pi60_hse/config.h +++ b/keyboards/1upkeyboards/pi60_hse/config.h @@ -3,8 +3,6 @@ #pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 310ad3d94b0bc7968fe412abe7eaa11491df8151..5b3e6b35e56e3cd8d5656d677e4b14587c370637 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -11,6 +11,9 @@ "vid": "0x6F75" }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "features": { "audio": false, "backlight": false, diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h index 37a85b4711ddea20bd15202f0cddc1588a9b30e7..e4609962f1f83bbeffcf8f23ee9ab32fc4be7fad 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -16,8 +16,6 @@ #pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 #define RGB_MATRIX_LED_COUNT 20 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index f1ac861c8c7298e6aefb7fade85e5ebfd533cb78..928c8106bf987e3fffa4b2220059ea3c5d5c20ba 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -33,6 +33,9 @@ "rows": ["GP26", "GP1", "GP18", "GP5"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "encoder": { "enabled": true, "rotary": [ diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h index f773468d8f1e3e82770067855bc60a389adee94b..e4609962f1f83bbeffcf8f23ee9ab32fc4be7fad 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h @@ -16,9 +16,6 @@ #pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 - #define RGB_MATRIX_LED_COUNT 20 #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index a8696ab64c9edaa4208aeb98987194fed8601114..87f2f3574c42b734ac667993563766e1cc55c658 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -31,6 +31,9 @@ "rows": ["D1", "B5", "B4", "E6"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "encoder": { "enabled": true, "rotary": [ diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 9bec945f24a884727e6aaf791f4fa1dcecd3ce9e..7b89744ff27a40cf3dcfd47b1eb98587336cf4a6 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -41,6 +41,3 @@ along with this program. If not, see . #define LAYER_3 A8 #define LAYER_4 A9 #define LAYER_5 B9 - -/* Added extra layer for use of layer leds */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 4be993daea16f9eaca054f93b185001f95e2282d..167051ca94c8fb3c2e24317212283a2d0551d417 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -13,6 +13,9 @@ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 5 + }, "backlight": { "pin": "A3", "levels": 10, diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 5d5eefda21840d4b957edb55c41ea7878eea06b4..b5957e6f30ccf77a8121fa1fa1286d70c26ab52a 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -34,6 +34,3 @@ along with this program. If not, see . #define LAYER_3 B0 #define LAYER_4 B9 #define LAYER_5 A9 - -/* Added extra layer for use of layer leds */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index ad7513c13d6e8f4c1aa58ac598f65eaa494009c5..2ebb260686936ecea9a667f24b682dfe11d0ef84 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -13,6 +13,9 @@ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 5 + }, "backlight": { "pin": "A6", "levels": 6, diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h index 790830c88b43ec001a5d3d5979de0d40bd9391b0..a50041ccc9c898ce98f01de802a380a27d017d9e 100644 --- a/keyboards/akko/5108/config.h +++ b/keyboards/akko/5108/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 5 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json index ef3f85a1ec0298e8d117e611ea2065a7ace60eb4..93e73f3cd32fa6b96522a7e3933dfea05e97c77a 100644 --- a/keyboards/akko/5108/info.json +++ b/keyboards/akko/5108/info.json @@ -26,6 +26,9 @@ "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h index 3f61359074459b9b424e446d5278e6d35e86a491..6afa4135521a404d89825bd2e221c9519d276b2b 100644 --- a/keyboards/akko/acr87/config.h +++ b/keyboards/akko/acr87/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 5 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json index f9d360282dd3545ab83e8a0ad7b3d1cf6b3f98e6..0533d328a9f213e66f44b1fea18c1f916145f534 100644 --- a/keyboards/akko/acr87/info.json +++ b/keyboards/akko/acr87/info.json @@ -26,6 +26,9 @@ "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h index cc72977c4d607ff9a357091b6ac36b843482f693..09474e1217fb5d27cb9be288f53b04f3783eedd1 100644 --- a/keyboards/akko/top40/config.h +++ b/keyboards/akko/top40/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 5 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json index 3624ee04112e88eb47da922fe67f3bc749521848..b5ff321740247a12dbe9c452ae36d7436c006061 100644 --- a/keyboards/akko/top40/info.json +++ b/keyboards/akko/top40/info.json @@ -26,6 +26,9 @@ "rows": ["C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/bemeier/bmek/config.h b/keyboards/bemeier/bmek/config.h index 455345409626d1bff06e32d8608c43a36b361de2..1deca961a0cbae30d8fb8caaee09ffde40036e42 100755 --- a/keyboards/bemeier/bmek/config.h +++ b/keyboards/bemeier/bmek/config.h @@ -15,6 +15,4 @@ */ #pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20 diff --git a/keyboards/bemeier/bmek/info.json b/keyboards/bemeier/bmek/info.json index 0959f9f3a6f2e1d19e2f0f8f89c744d80a0d136e..31d2b5f9bd96c64c409c95697caa948e616aa91f 100755 --- a/keyboards/bemeier/bmek/info.json +++ b/keyboards/bemeier/bmek/info.json @@ -7,6 +7,9 @@ "vid": "0x626D", "pid": "0x656B" }, + "dynamic_keymap": { + "layer_count": 5 + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h index e837c9745bccce98e0b99b910ebf8a550af4c75f..2c85f5dd04a2c27fcb592f473079a372baf8ee6a 100644 --- a/keyboards/chosfox/cf81/config.h +++ b/keyboards/chosfox/cf81/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 4 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/deng/thirty/config.h b/keyboards/deng/thirty/config.h index 20e6673dd2cea4c8ceb40de6b03342a636feb506..8ec8f6b0d30cfe9a09af1ace0e6b635c03ee35cf 100644 --- a/keyboards/deng/thirty/config.h +++ b/keyboards/deng/thirty/config.h @@ -78,8 +78,3 @@ #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif - -/* VIA */ -#ifdef VIA_ENABLE -#define DYNAMIC_KEYMAP_LAYER_COUNT 8 -#endif diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 8836273865b43e0025010c9c457780bb414e7dad..b93881c0866887ee397c2bb8cb3d4d403f3001c5 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -16,6 +16,9 @@ "rows": ["B15", "A5", "A3", "A15", "B7", "B8"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 8 + }, "backlight": { "pin": "B11", "levels": 5, diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h index e34b4d34ab147c731b2310ae9d8ec32468e850dc..ddb4b6702fcdc0635a11c7e2c606753dbf5c2e0d 100644 --- a/keyboards/dm9records/lain/config.h +++ b/keyboards/dm9records/lain/config.h @@ -12,5 +12,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json index 8ae8a33b4445dc55aeac5a37a5f18c65d584f767..250eb2ddafdf520ead7a29da0a8d447fc42f3b3e 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/info.json @@ -13,6 +13,9 @@ "rows": ["C6", "D7", "D6", "D4"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/doio/kb30/config.h b/keyboards/doio/kb30/config.h index a87532c45973b55bfe9ee3250ecf5000aff404ac..2a1a8273751e6ae19ee3146161bf73c849cb3dbe 100644 --- a/keyboards/doio/kb30/config.h +++ b/keyboards/doio/kb30/config.h @@ -89,9 +89,6 @@ #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #endif - - -// #define DYNAMIC_KEYMAP_LAYER_COUNT 4 /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/gkeyboard/gpad8_2r/config.h b/keyboards/gkeyboard/gpad8_2r/config.h index 0691d106b706e5125220da905e3ee65a31d9c2b2..88debbe193a4494e0998af618c6746973c64e7fd 100644 --- a/keyboards/gkeyboard/gpad8_2r/config.h +++ b/keyboards/gkeyboard/gpad8_2r/config.h @@ -3,8 +3,6 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 8 - #define RGB_MATRIX_LED_COUNT 16 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json index 2111d58cc4b1ee967ee1239c43391985697ccb42..9aa63091c978b7c5461ae6bf3061e33d718371e9 100644 --- a/keyboards/gkeyboard/gpad8_2r/info.json +++ b/keyboards/gkeyboard/gpad8_2r/info.json @@ -25,6 +25,9 @@ "rows": ["GP4", "GP5", "GP6"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 8 + }, "encoder": { "enabled": true, "rotary": [ diff --git a/keyboards/idyllic/tinny50_rgb/config.h b/keyboards/idyllic/tinny50_rgb/config.h index 15e1a6ff5cb267e4896a8182ad637f1c854e7980..0cb5eac43242af23f533e6532fe63e378b305357 100644 --- a/keyboards/idyllic/tinny50_rgb/config.h +++ b/keyboards/idyllic/tinny50_rgb/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS * 7/8 diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json index f02e88f45989295c979cbe2b1a8d92fd525843df..7e68b960f5b322b6d2cab78b46ad2b6600986317 100644 --- a/keyboards/idyllic/tinny50_rgb/info.json +++ b/keyboards/idyllic/tinny50_rgb/info.json @@ -22,6 +22,9 @@ "rgb_matrix": true }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "matrix_pins": { "rows": ["GP0", "GP2", "GP3", "GP4", "GP7"], "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP20", "GP19", "GP1", "GP6", "GP5"] diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h index e36574e56a8fcbfadb7091c44d44d500a4383860..541a6ae2f051d612f90b16ab15bc1ec2fe68092e 100644 --- a/keyboards/jones/v1/config.h +++ b/keyboards/jones/v1/config.h @@ -32,8 +32,3 @@ along with this program. If not, see . /* External EEPROM */ // Use 24LC64 EEPROM #define EEPROM_I2C_24LC64 -// Set MAX_ADDR to specify actual EEPROM size. -// If it's not set, EEPROM size will be set ATmega32u4's 1023. -#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191 -// How many layers to use with VIA / Remap. -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 // default:4 diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index 0e7902a92ad2c0bc4b49f488dc47cfb227056f0c..54496d316490f0eacebf5251f9c22dcce51ebae0 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -21,6 +21,9 @@ "pin": "F1" }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "i2c" }, diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h index 75aa26956cf1e893d341c087186754a5f6bcd2e1..f078cf34cc1f79041f2528df5c510b47775a4468 100644 --- a/keyboards/mechwild/sugarglider/config.h +++ b/keyboards/mechwild/sugarglider/config.h @@ -3,8 +3,6 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 - /* Matrix COL and ROW definitions */ #define MATRIX_ROWS 9 #define MATRIX_COLS 6 diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index f8439dde1101bae6c5738ea6e24c9afa8a784842..7448ae2854e883a8048804fd9521dba96219ca88 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -23,6 +23,9 @@ "force_nkro": true }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 5 + }, "rgblight": { "led_count": 10, "max_brightness": 255, diff --git a/keyboards/monsgeek/m1/config.h b/keyboards/monsgeek/m1/config.h index 162001fca63d8822e1ed1fbc049957ecef4fa5ac..efec0207c351126da77163ba564442f3602ddde7 100644 --- a/keyboards/monsgeek/m1/config.h +++ b/keyboards/monsgeek/m1/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 6 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/monsgeek/m1/info.json b/keyboards/monsgeek/m1/info.json index 6fbc22b101a8b5673bede4725438062ed442a8ba..3eade9d76d32f5139ab60bd1d318e989b7832eda 100644 --- a/keyboards/monsgeek/m1/info.json +++ b/keyboards/monsgeek/m1/info.json @@ -26,6 +26,9 @@ "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/monsgeek/m5/config.h b/keyboards/monsgeek/m5/config.h index a92c4975ebd9581ba76c85ab07102b10863e9011..ef2a43cdb3db6f186d2756d2cee43bb56122a370 100644 --- a/keyboards/monsgeek/m5/config.h +++ b/keyboards/monsgeek/m5/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 5 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 diff --git a/keyboards/monsgeek/m5/info.json b/keyboards/monsgeek/m5/info.json index 1e9ec8618af7558acac8d3373d5c3760bd7ca940..7b01d2526d08e8ae2198e92b90f85c5f5757208f 100644 --- a/keyboards/monsgeek/m5/info.json +++ b/keyboards/monsgeek/m5/info.json @@ -25,6 +25,9 @@ "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h index c6f7d55e9ddcb1380a1cdb7b444afb8c38e0a4df..fac90ac0ad2c34477b08db57660522eb6db942cc 100644 --- a/keyboards/monsgeek/m6/config.h +++ b/keyboards/monsgeek/m6/config.h @@ -16,9 +16,6 @@ #pragma once -/* Use 6 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/monsgeek/m6/info.json b/keyboards/monsgeek/m6/info.json index 7751ef13d6899f1d3f9650321619728e2210c1d4..d3951c804611ace07ca6a164d35cfd22d68824e3 100644 --- a/keyboards/monsgeek/m6/info.json +++ b/keyboards/monsgeek/m6/info.json @@ -25,6 +25,9 @@ "rows": ["C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 6 + }, "eeprom": { "driver": "wear_leveling", "wear_leveling": { diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h index cabfaf9900cf523b2c2470dc43a0b230f7e46050..7c20260162d6e8435697ef5256ebf7411e400bd2 100644 --- a/keyboards/moonlander/config.h +++ b/keyboards/moonlander/config.h @@ -142,10 +142,6 @@ #define FIRMWARE_VERSION_SIZE 17 #define DYNAMIC_KEYMAP_EEPROM_ADDR (EECONFIG_SIZE + FIRMWARE_VERSION_SIZE) -#ifdef EEPROM_I2C -# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383 -# define DYNAMIC_KEYMAP_LAYER_COUNT 8 -#endif #define AUDIO_PIN A5 #define AUDIO_PIN_ALT A4 diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json index 21779adced73f74e5e466853a9c4666a87781f57..1a7982ed571f01fc009a9f60d913d2f6483e79cd 100644 --- a/keyboards/moonlander/info.json +++ b/keyboards/moonlander/info.json @@ -8,6 +8,9 @@ "pid": "0x1969", "device_version": "0.0.1" }, + "dynamic_keymap": { + "layer_count": 8 + }, "eeprom": { "driver": "i2c" }, diff --git a/keyboards/primekb/prime_e/config.h b/keyboards/primekb/prime_e/config.h index e3e1572d99600fa628bc752d17ca281a181de322..6c8ce4c0eaf56fd055c4f0ab678c2dc1ecbd1190 100644 --- a/keyboards/primekb/prime_e/config.h +++ b/keyboards/primekb/prime_e/config.h @@ -21,5 +21,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define DYNAMIC_KEYMAP_LAYER_COUNT 8 diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index f94271be6ce3b4733cf41688c0265b1eb47fc521..dee7a23e02707c6ce1b994894c49700861fad9dd 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -10,6 +10,9 @@ "rows": ["E6", "C7", "B5", "B4"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h index 1148463200fa5536cb9bfefa3aaacf7a0607f09a..72b4ea84e71bd60ae8ef9e41ad89c5fa697b2d3a 100644 --- a/keyboards/pteron36/config.h +++ b/keyboards/pteron36/config.h @@ -37,6 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -// for via -#define DYNAMIC_KEYMAP_LAYER_COUNT 7 diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json index 418ca0f6b8ab6ac0c2b04e78d2750da2e0e66162..76b6e5964719a4e8e2f089b9b99abb29d439ed10 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/info.json @@ -13,6 +13,9 @@ "rows": ["E6", "D7", "B4", "B5"] }, "diode_direction": "ROW2COL", + "dynamic_keymap": { + "layer_count": 7 + }, "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"} diff --git a/keyboards/qvex/lynepad2/config.h b/keyboards/qvex/lynepad2/config.h index 7b9d3ce306ed003286d00228c1bc6aa68cb33fe6..9e1f70b38bcb9d0bd1f6b386aa3f84ef15f2682c 100644 --- a/keyboards/qvex/lynepad2/config.h +++ b/keyboards/qvex/lynepad2/config.h @@ -16,8 +16,6 @@ along with this program. If not, see . #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 - //Digital joystick (4-way switch + encoder) #define PIN_JU D4 #define PIN_JD B6 diff --git a/keyboards/qvex/lynepad2/info.json b/keyboards/qvex/lynepad2/info.json index 4230fd63e0d23baa57edddcf84d5bdd457b06bf0..7919c2adc2a25a9c2dbe5d5e6348c805f0cd2ec5 100644 --- a/keyboards/qvex/lynepad2/info.json +++ b/keyboards/qvex/lynepad2/info.json @@ -15,6 +15,9 @@ "vid": "0x04D8", "pid": "0xE678" }, + "dynamic_keymap": { + "layer_count": 5 + }, "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "B5", "resolution": 2}, diff --git a/keyboards/sirius/uni660/rev1/config.h b/keyboards/sirius/uni660/rev1/config.h index 0cd138a95c093090bb36cd2d7abca7a888645f52..b9e511d9a376ef18730596e57cb96410ada26fe4 100644 --- a/keyboards/sirius/uni660/rev1/config.h +++ b/keyboards/sirius/uni660/rev1/config.h @@ -39,5 +39,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h index 0cd138a95c093090bb36cd2d7abca7a888645f52..b9e511d9a376ef18730596e57cb96410ada26fe4 100644 --- a/keyboards/sirius/uni660/rev2/ansi/config.h +++ b/keyboards/sirius/uni660/rev2/ansi/config.h @@ -39,5 +39,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h index 0cd138a95c093090bb36cd2d7abca7a888645f52..b9e511d9a376ef18730596e57cb96410ada26fe4 100644 --- a/keyboards/sirius/uni660/rev2/iso/config.h +++ b/keyboards/sirius/uni660/rev2/iso/config.h @@ -39,5 +39,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h index 00ecf5f18620be0393c06456f18be54d5335cada..c8c922be6fea24c919e8817f60a4b3fc15565d5d 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/config.h +++ b/keyboards/wilba_tech/rama_works_m10_b/config.h @@ -37,5 +37,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json index 0d80bce8a86238bf17266c4aa8200043c52fff5b..eb861e8d3f819694bf0629d392d24942e1b2228a 100644 --- a/keyboards/wilba_tech/rama_works_m10_b/info.json +++ b/keyboards/wilba_tech/rama_works_m10_b/info.json @@ -13,6 +13,9 @@ "rows": ["E6"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "backlight": { "pin": "C6" }, diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h index d5e47ac8795f11effa15cd43521a956f020c6f7c..b3cb0ef7a8b22c3c4850a5d462ab6cb5d3c31a9a 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/config.h +++ b/keyboards/wilba_tech/rama_works_m10_c/config.h @@ -73,8 +73,6 @@ #define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 } #define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 } -#define DYNAMIC_KEYMAP_LAYER_COUNT 10 - // Backlight config starts after VIA's EEPROM usage, // dynamic keymaps start after this. #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 51 diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json index 64af4a5dcf16d7649208801c6c093951e706ad0e..3b75a67557e14b18b80ce93a83d1230f31e3a571 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/info.json @@ -13,6 +13,9 @@ "rows": ["E6"] }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/zykrah/fuyu/config.h b/keyboards/zykrah/fuyu/config.h index 0f24dfe7e356dee6283f5a3c879fa38d43de4abc..20b0feb5230643424c8116af54b1de0464116ce3 100644 --- a/keyboards/zykrah/fuyu/config.h +++ b/keyboards/zykrah/fuyu/config.h @@ -14,8 +14,6 @@ along with this program. If not, see . #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json index 874114bfcae50948ad8552ae87b5d9431a21016e..5431d14329ea5740c78b72a6761fa62fe3c1a540 100644 --- a/keyboards/zykrah/fuyu/info.json +++ b/keyboards/zykrah/fuyu/info.json @@ -19,6 +19,9 @@ "rgb_matrix": true }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "matrix_pins": { "rows": ["GP13", "GP12", "GP11", "GP10", "GP15", "GP14"], "cols": ["GP29", "GP28", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP27", "GP9", "GP1", "GP0"] diff --git a/keyboards/zykrah/slime88/config.h b/keyboards/zykrah/slime88/config.h index eb91a14f6e30e99010e105d9d013601ec606083c..e1a00bae4ac85a6ebcd5ce00d283f0f97d5610e7 100644 --- a/keyboards/zykrah/slime88/config.h +++ b/keyboards/zykrah/slime88/config.h @@ -14,7 +14,5 @@ along with this program. If not, see . #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U diff --git a/keyboards/zykrah/slime88/info.json b/keyboards/zykrah/slime88/info.json index bf1719352d10ba3e3311e9af111d7a720ba04e79..8b15524ccacb20e68e5bbfe518d90862a212149e 100644 --- a/keyboards/zykrah/slime88/info.json +++ b/keyboards/zykrah/slime88/info.json @@ -18,6 +18,9 @@ "nkro": true }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 6 + }, "matrix_pins": { "rows": ["GP2", "GP29", "GP28", "GP27", "GP11", "GP12"], "cols": ["GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP0", "GP1", "GP3"]