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 8940acb0041..6bbbb2293c0 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 2d3797c1a8d..4d0d21ea250 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 a47120f7d39..b7c4d5e8bc8 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 310ad3d94b0..5b3e6b35e56 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 37a85b4711d..e4609962f1f 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 f1ac861c8c7..928c8106bf9 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 f773468d8f1..e4609962f1f 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 a8696ab64c9..87f2f3574c4 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 9bec945f24a..7b89744ff27 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 4be993daea1..167051ca94c 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 5d5eefda218..b5957e6f30c 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 ad7513c13d6..2ebb2606869 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 790830c88b4..a50041ccc9c 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 ef3f85a1ec0..93e73f3cd32 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 3f613590744..6afa4135521 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 f9d360282dd..0533d328a9f 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 cc72977c4d6..09474e1217f 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 3624ee04112..b5ff3217402 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 45534540962..1deca961a0c 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 0959f9f3a6f..31d2b5f9bd9 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 e837c9745bc..2c85f5dd04a 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 20e6673dd2c..8ec8f6b0d30 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 8836273865b..b93881c0866 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 e34b4d34ab1..ddb4b6702fc 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 8ae8a33b444..250eb2ddafd 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 a87532c4597..2a1a8273751 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 0691d106b70..88debbe193a 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 2111d58cc4b..9aa63091c97 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 15e1a6ff5cb..0cb5eac4324 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 f02e88f4598..7e68b960f5b 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 e36574e56a8..541a6ae2f05 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 0e7902a92ad..54496d31649 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 75aa26956cf..f078cf34cc1 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 f8439dde110..7448ae2854e 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 162001fca63..efec0207c35 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 6fbc22b101a..3eade9d76d3 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 a92c4975ebd..ef2a43cdb3d 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 1e9ec8618af..7b01d2526d0 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 c6f7d55e9dd..fac90ac0ad2 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 7751ef13d68..d3951c80461 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 cabfaf9900c..7c20260162d 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 21779adced7..1a7982ed571 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 e3e1572d996..6c8ce4c0eaf 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 f94271be6ce..dee7a23e027 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 1148463200f..72b4ea84e71 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 418ca0f6b8a..76b6e596471 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 7b9d3ce306e..9e1f70b38bc 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 4230fd63e0d..7919c2adc2a 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 0cd138a95c0..b9e511d9a37 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 0cd138a95c0..b9e511d9a37 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 0cd138a95c0..b9e511d9a37 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 00ecf5f1862..c8c922be6fe 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 0d80bce8a86..eb861e8d3f8 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 d5e47ac8795..b3cb0ef7a8b 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 64af4a5dcf1..3b75a67557e 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 0f24dfe7e35..20b0feb5230 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 874114bfcae..5431d14329e 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 eb91a14f6e3..e1a00bae4ac 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 bf1719352d1..8b15524ccac 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"]