Migrate dynamic_keymap.layer_count < 4 where requried (#22091)

Co-authored-by: Nick Brassel <nick@tzarc.org>
2024-01-09 10:15:03 +00:00 · 2024-01-09 10:15:03 +00:00 · 66050bb809
parent 455cd65e80
commit 66050bb809
51 changed files with 54 additions and 77 deletions
--- a/keyboards/adpenrose/mine/config.h
+++ b/keyboards/adpenrose/mine/config.h
@ -5,5 +5,3 @@

 /* Solenoid pin */
 #define SOLENOID_PIN A7
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
--- a/keyboards/adpenrose/mine/info.json
+++ b/keyboards/adpenrose/mine/info.json
@ -15,6 +15,9 @@
    "build": {
        "lto": true
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "encoder": {
        "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
    },
--- a/keyboards/aliceh66/pianoforte/config.h
+++ b/keyboards/aliceh66/pianoforte/config.h
@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
--- a/keyboards/aliceh66/pianoforte_hs/config.h
+++ b/keyboards/aliceh66/pianoforte_hs/config.h
@ -17,11 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
--- a/keyboards/basekeys/trifecta/config.h
+++ b/keyboards/basekeys/trifecta/config.h
@ -21,6 +21,3 @@

 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* EEPROM for via */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@ -10,6 +10,9 @@
  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
  "community_layouts": ["tkl_ansi"],
  "layouts": {
    "LAYOUT": {
--- a/keyboards/bpiphany/pegasushoof/2013/config.h
+++ b/keyboards/bpiphany/pegasushoof/2013/config.h
@ -20,5 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3  // not enough memory for a 4th layer with VIA
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
@ -1,6 +1,9 @@
 {
    "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "C6",
        "scroll_lock": "C5",
--- a/keyboards/bpiphany/pegasushoof/2015/config.h
+++ b/keyboards/bpiphany/pegasushoof/2015/config.h
@ -20,5 +20,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3  // not enough memory for a 4th layer with VIA
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@ -1,6 +1,9 @@
 {
    "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "C6",
        "scroll_lock": "C5",
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/cannonkeys/brutalv2_1800/config.h
+++ b/keyboards/cannonkeys/brutalv2_1800/config.h
@ -20,6 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U

-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
-
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@ -22,9 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@ -31,8 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13

-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@ -36,5 +36,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@ -13,6 +13,9 @@
        "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
    },
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "D5",
        "num_lock": "B7",
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@ -37,5 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@ -13,6 +13,9 @@
        "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"]
    },
    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "F7",
        "scroll_lock": "F6",
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@ -52,5 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@ -13,6 +13,9 @@
    "bootmagic": {
        "matrix": [0, 5]
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "qmk_lufa_bootloader": {
        "esc_output": "D6",
        "esc_input": "D7",
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@ -13,6 +13,9 @@
        "levels": 5,
        "breathing": true
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "qmk_lufa_bootloader": {
        "esc_input": "F0",
        "esc_output": "E6",
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-
-/* Maximum dynamic keymap layers (constrained by EEPROM space) */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 16
--- a/keyboards/fc980c/info.json
+++ b/keyboards/fc980c/info.json
@ -8,6 +8,9 @@
    "pid": "0x980C",
    "device_version": "1.0.0"
  },
+  "dynamic_keymap": {
+    "layer_count": 3
+  },
  "indicators": {
    "caps_lock": "B5",
    "num_lock": "B4",
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@ -24,5 +24,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@ -33,6 +33,9 @@
        "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"]
    },
    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "encoder": {
        "rotary": [
            {"pin_a": "B3", "pin_b": "B5"},
--- a/keyboards/kapcave/arya/config.h
+++ b/keyboards/kapcave/arya/config.h
@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/config.h
@ -22,6 +22,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-/* reduce EEPROM usage */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
 #define LAYER_STATE_8BIT
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@ -13,6 +13,9 @@
        "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
    },
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "B1",
        "num_lock": "B2",
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@ -75,4 +75,3 @@
 #define RGB_MATRIX_LED_COUNT 108
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@ -75,4 +75,3 @@
 #define RGB_MATRIX_LED_COUNT 109
 #define DRIVER_INDICATOR_LED_TOTAL 0
 #endif
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
--- a/keyboards/keebio/sinc/rev1/config.h
+++ b/keyboards/keebio/sinc/rev1/config.h
@ -27,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@ -7,6 +7,9 @@
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "features": {
        "rgblight": true,
        "backlight": true
--- a/keyboards/keebio/sinc/rev2/config.h
+++ b/keyboards/keebio/sinc/rev2/config.h
@ -27,4 +27,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)

 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@ -7,6 +7,9 @@
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "features": {
        "rgblight": true,
        "backlight": true
--- a/keyboards/nopunin10did/jabberwocky/v1/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v1/config.h
@ -21,6 +21,3 @@

 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Reducing layer count to 3 for via support */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/nopunin10did/jabberwocky/v1/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v1/info.json
@ -17,6 +17,9 @@
        "caps_lock": "B0",
        "num_lock": "D1"
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
--- a/keyboards/nopunin10did/jabberwocky/v2/config.h
+++ b/keyboards/nopunin10did/jabberwocky/v2/config.h
@ -21,6 +21,3 @@

 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Reducing layer count to 3 for via support */
-#define DYNAMIC_KEYMAP_LAYER_COUNT  3
--- a/keyboards/nopunin10did/jabberwocky/v2/info.json
+++ b/keyboards/nopunin10did/jabberwocky/v2/info.json
@ -18,6 +18,9 @@
        "pin": "D6",
        "levels": 6
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "B7",
        "num_lock": "C6"
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@ -24,6 +24,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
--- a/keyboards/oddforge/vea/info.json
+++ b/keyboards/oddforge/vea/info.json
@ -11,6 +11,9 @@
    "backlight": {
        "pin": "D4"
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "rgblight": {
        "led_count": 18,
        "sleep": true,
--- a/keyboards/teleport/native/config.h
+++ b/keyboards/teleport/native/config.h
@ -14,9 +14,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-/* Use 3 dynamic keymap layers */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /* i2C Config */
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN        B6
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@ -17,6 +17,9 @@
        "pin": "B7",
        "breathing": true
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "indicators": {
        "caps_lock": "F0",
        "num_lock": "F1"
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #pragma once

-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
--- a/keyboards/wavtype/p01_ultra/config.h
+++ b/keyboards/wavtype/p01_ultra/config.h
@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE

-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
--- a/keyboards/ydkb/grape/config.h
+++ b/keyboards/ydkb/grape/config.h
@ -28,5 +28,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
--- a/keyboards/ydkb/grape/info.json
+++ b/keyboards/ydkb/grape/info.json
@ -12,6 +12,9 @@
        "pin": "B7",
        "breathing": true
    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
    "rgblight": {
        "led_count": 4
    },
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@ -27,9 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Mouse Keys Combined mode */
 //#define MK_COMBINED

-/* Layer Count */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
-
 /*
 * Feature disable options
 *  These options are also useful to firmware size reduction.