~ruther/qmk_firmware

66050bb809b2e173dbcf5ae59f81ed127b193df0 — Joel Challis 1 year, 5 months ago 455cd65
Migrate dynamic_keymap.layer_count < 4 where requried (#22091)

Co-authored-by: Nick Brassel <nick@tzarc.org>
51 files changed, 54 insertions(+), 77 deletions(-)

M keyboards/adpenrose/mine/config.h
M keyboards/adpenrose/mine/info.json
M keyboards/aliceh66/pianoforte/config.h
M keyboards/aliceh66/pianoforte_hs/config.h
M keyboards/basekeys/trifecta/config.h
M keyboards/bpiphany/frosty_flake/config.h
M keyboards/bpiphany/frosty_flake/info.json
M keyboards/bpiphany/pegasushoof/2013/config.h
M keyboards/bpiphany/pegasushoof/2013/info.json
M keyboards/bpiphany/pegasushoof/2015/config.h
M keyboards/bpiphany/pegasushoof/2015/info.json
M keyboards/cannonkeys/balance/config.h
M keyboards/cannonkeys/brutalv2_1800/config.h
M keyboards/cannonkeys/hoodrowg/config.h
M keyboards/cannonkeys/rekt1800/config.h
M keyboards/cannonkeys/sagittarius/config.h
M keyboards/evyd13/eon95/config.h
M keyboards/evyd13/eon95/info.json
M keyboards/evyd13/quackfire/config.h
M keyboards/evyd13/quackfire/info.json
M keyboards/evyd13/wasdat/config.h
M keyboards/evyd13/wasdat/info.json
M keyboards/evyd13/wasdat_code/config.h
M keyboards/evyd13/wasdat_code/info.json
M keyboards/fc980c/config.h
M keyboards/fc980c/info.json
M keyboards/kabedon/kabedon98e/config.h
M keyboards/kabedon/kabedon98e/info.json
M keyboards/kapcave/arya/config.h
M keyboards/kb_elmo/aek2_usb/config.h
M keyboards/kb_elmo/aek2_usb/info.json
M keyboards/kbdfans/bella/rgb/config.h
M keyboards/kbdfans/bella/rgb_iso/config.h
M keyboards/keebio/sinc/rev1/config.h
M keyboards/keebio/sinc/rev1/info.json
M keyboards/keebio/sinc/rev2/config.h
M keyboards/keebio/sinc/rev2/info.json
M keyboards/nopunin10did/jabberwocky/v1/config.h
M keyboards/nopunin10did/jabberwocky/v1/info.json
M keyboards/nopunin10did/jabberwocky/v2/config.h
M keyboards/nopunin10did/jabberwocky/v2/info.json
M keyboards/oddforge/vea/config.h
M keyboards/oddforge/vea/info.json
M keyboards/teleport/native/config.h
M keyboards/tkc/california/config.h
M keyboards/tkc/california/info.json
M keyboards/tkc/tkl_ab87/config.h
M keyboards/wavtype/p01_ultra/config.h
M keyboards/ydkb/grape/config.h
M keyboards/ydkb/grape/info.json
M keyboards/yoichiro/lunakey_macro/config.h
M keyboards/adpenrose/mine/config.h => keyboards/adpenrose/mine/config.h +0 -2
@@ 5,5 5,3 @@

/* Solenoid pin */
#define SOLENOID_PIN A7

#define DYNAMIC_KEYMAP_LAYER_COUNT 2

M keyboards/adpenrose/mine/info.json => keyboards/adpenrose/mine/info.json +3 -0
@@ 15,6 15,9 @@
    "build": {
        "lto": true
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "encoder": {
        "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
    },

M keyboards/aliceh66/pianoforte/config.h => keyboards/aliceh66/pianoforte/config.h +0 -4
@@ 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



M keyboards/aliceh66/pianoforte_hs/config.h => keyboards/aliceh66/pianoforte_hs/config.h +0 -4
@@ 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



M keyboards/basekeys/trifecta/config.h => keyboards/basekeys/trifecta/config.h +0 -3
@@ 21,6 21,3 @@

/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* EEPROM for via */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

M keyboards/bpiphany/frosty_flake/config.h => keyboards/bpiphany/frosty_flake/config.h +0 -2
@@ 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

M keyboards/bpiphany/frosty_flake/info.json => keyboards/bpiphany/frosty_flake/info.json +3 -0
@@ 10,6 10,9 @@
  },
  "processor": "atmega32u2",
  "bootloader": "atmel-dfu",
  "dynamic_keymap": {
    "layer_count": 3
  },
  "community_layouts": ["tkl_ansi"],
  "layouts": {
    "LAYOUT": {

M keyboards/bpiphany/pegasushoof/2013/config.h => keyboards/bpiphany/pegasushoof/2013/config.h +0 -2
@@ 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

M keyboards/bpiphany/pegasushoof/2013/info.json => keyboards/bpiphany/pegasushoof/2013/info.json +3 -0
@@ 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",

M keyboards/bpiphany/pegasushoof/2015/config.h => keyboards/bpiphany/pegasushoof/2015/config.h +0 -2
@@ 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

M keyboards/bpiphany/pegasushoof/2015/info.json => keyboards/bpiphany/pegasushoof/2015/info.json +3 -0
@@ 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",

M keyboards/cannonkeys/balance/config.h => keyboards/cannonkeys/balance/config.h +0 -2
@@ 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.

M keyboards/cannonkeys/brutalv2_1800/config.h => keyboards/cannonkeys/brutalv2_1800/config.h +0 -2
@@ 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


M keyboards/cannonkeys/hoodrowg/config.h => keyboards/cannonkeys/hoodrowg/config.h +0 -3
@@ 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.

M keyboards/cannonkeys/rekt1800/config.h => keyboards/cannonkeys/rekt1800/config.h +0 -3
@@ 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.

M keyboards/cannonkeys/sagittarius/config.h => keyboards/cannonkeys/sagittarius/config.h +0 -2
@@ 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.

M keyboards/evyd13/eon95/config.h => keyboards/evyd13/eon95/config.h +0 -2
@@ 36,5 36,3 @@
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

#define DYNAMIC_KEYMAP_LAYER_COUNT 3

M keyboards/evyd13/eon95/info.json => keyboards/evyd13/eon95/info.json +3 -0
@@ 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",

M keyboards/evyd13/quackfire/config.h => keyboards/evyd13/quackfire/config.h +0 -2
@@ 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

M keyboards/evyd13/quackfire/info.json => keyboards/evyd13/quackfire/info.json +3 -0
@@ 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",

M keyboards/evyd13/wasdat/config.h => keyboards/evyd13/wasdat/config.h +0 -2
@@ 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

M keyboards/evyd13/wasdat/info.json => keyboards/evyd13/wasdat/info.json +3 -0
@@ 13,6 13,9 @@
    "bootmagic": {
        "matrix": [0, 5]
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "qmk_lufa_bootloader": {
        "esc_output": "D6",
        "esc_input": "D7",

M keyboards/evyd13/wasdat_code/config.h => keyboards/evyd13/wasdat_code/config.h +0 -2
@@ 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

M keyboards/evyd13/wasdat_code/info.json => keyboards/evyd13/wasdat_code/info.json +3 -0
@@ 13,6 13,9 @@
        "levels": 5,
        "breathing": true
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "qmk_lufa_bootloader": {
        "esc_input": "F0",
        "esc_output": "E6",

M keyboards/fc980c/config.h => keyboards/fc980c/config.h +0 -4
@@ 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

M keyboards/fc980c/info.json => keyboards/fc980c/info.json +3 -0
@@ 8,6 8,9 @@
    "pid": "0x980C",
    "device_version": "1.0.0"
  },
  "dynamic_keymap": {
    "layer_count": 3
  },
  "indicators": {
    "caps_lock": "B5",
    "num_lock": "B4",

M keyboards/kabedon/kabedon98e/config.h => keyboards/kabedon/kabedon98e/config.h +0 -2
@@ 24,5 24,3 @@
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define DYNAMIC_KEYMAP_LAYER_COUNT 3

M keyboards/kabedon/kabedon98e/info.json => keyboards/kabedon/kabedon98e/info.json +3 -0
@@ 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"},

M keyboards/kapcave/arya/config.h => keyboards/kapcave/arya/config.h +0 -2
@@ 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.

M keyboards/kb_elmo/aek2_usb/config.h => keyboards/kb_elmo/aek2_usb/config.h +0 -2
@@ 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

M keyboards/kb_elmo/aek2_usb/info.json => keyboards/kb_elmo/aek2_usb/info.json +3 -0
@@ 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",

M keyboards/kbdfans/bella/rgb/config.h => keyboards/kbdfans/bella/rgb/config.h +0 -1
@@ 75,4 75,3 @@
#define RGB_MATRIX_LED_COUNT 108
#define DRIVER_INDICATOR_LED_TOTAL 0
#endif
#define DYNAMIC_KEYMAP_LAYER_COUNT 2

M keyboards/kbdfans/bella/rgb_iso/config.h => keyboards/kbdfans/bella/rgb_iso/config.h +0 -1
@@ 75,4 75,3 @@
#define RGB_MATRIX_LED_COUNT 109
#define DRIVER_INDICATOR_LED_TOTAL 0
#endif
#define DYNAMIC_KEYMAP_LAYER_COUNT 2

M keyboards/keebio/sinc/rev1/config.h => keyboards/keebio/sinc/rev1/config.h +0 -1
@@ 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

M keyboards/keebio/sinc/rev1/info.json => keyboards/keebio/sinc/rev1/info.json +3 -0
@@ 7,6 7,9 @@
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
    "dynamic_keymap": {
        "layer_count": 3
    },
    "features": {
        "rgblight": true,
        "backlight": true

M keyboards/keebio/sinc/rev2/config.h => keyboards/keebio/sinc/rev2/config.h +0 -1
@@ 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

M keyboards/keebio/sinc/rev2/info.json => keyboards/keebio/sinc/rev2/info.json +3 -0
@@ 7,6 7,9 @@
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "diode_direction": "COL2ROW",
    "dynamic_keymap": {
        "layer_count": 3
    },
    "features": {
        "rgblight": true,
        "backlight": true

M keyboards/nopunin10did/jabberwocky/v1/config.h => keyboards/nopunin10did/jabberwocky/v1/config.h +0 -3
@@ 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

M keyboards/nopunin10did/jabberwocky/v1/info.json => keyboards/nopunin10did/jabberwocky/v1/info.json +3 -0
@@ 17,6 17,9 @@
        "caps_lock": "B0",
        "num_lock": "D1"
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {

M keyboards/nopunin10did/jabberwocky/v2/config.h => keyboards/nopunin10did/jabberwocky/v2/config.h +0 -3
@@ 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

M keyboards/nopunin10did/jabberwocky/v2/info.json => keyboards/nopunin10did/jabberwocky/v2/info.json +3 -0
@@ 18,6 18,9 @@
        "pin": "D6",
        "levels": 6
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "indicators": {
        "caps_lock": "B7",
        "num_lock": "C6"

M keyboards/oddforge/vea/config.h => keyboards/oddforge/vea/config.h +0 -2
@@ 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

M keyboards/oddforge/vea/info.json => keyboards/oddforge/vea/info.json +3 -0
@@ 11,6 11,9 @@
    "backlight": {
        "pin": "D4"
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "rgblight": {
        "led_count": 18,
        "sleep": true,

M keyboards/teleport/native/config.h => keyboards/teleport/native/config.h +0 -3
@@ 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

M keyboards/tkc/california/config.h => keyboards/tkc/california/config.h +0 -3
@@ 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 */

M keyboards/tkc/california/info.json => keyboards/tkc/california/info.json +3 -0
@@ 17,6 17,9 @@
        "pin": "B7",
        "breathing": true
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "indicators": {
        "caps_lock": "F0",
        "num_lock": "F1"

M keyboards/tkc/tkl_ab87/config.h => keyboards/tkc/tkl_ab87/config.h +0 -3
@@ 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 */

M keyboards/wavtype/p01_ultra/config.h => keyboards/wavtype/p01_ultra/config.h +0 -2
@@ 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.

M keyboards/ydkb/grape/config.h => keyboards/ydkb/grape/config.h +0 -2
@@ 28,5 28,3 @@
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

#define DYNAMIC_KEYMAP_LAYER_COUNT 3

M keyboards/ydkb/grape/info.json => keyboards/ydkb/grape/info.json +3 -0
@@ 12,6 12,9 @@
        "pin": "B7",
        "breathing": true
    },
    "dynamic_keymap": {
        "layer_count": 3
    },
    "rgblight": {
        "led_count": 4
    },

M keyboards/yoichiro/lunakey_macro/config.h => keyboards/yoichiro/lunakey_macro/config.h +0 -3
@@ 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.

Do not follow this link