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

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Joel Challis 2024-01-09 10:15:03 +00:00 committed by GitHub
parent 455cd65e80
commit 66050bb809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 54 additions and 77 deletions

View file

@ -5,5 +5,3 @@
/* Solenoid pin */ /* Solenoid pin */
#define SOLENOID_PIN A7 #define SOLENOID_PIN A7
#define DYNAMIC_KEYMAP_LAYER_COUNT 2

View file

@ -15,6 +15,9 @@
"build": { "build": {
"lto": true "lto": true
}, },
"dynamic_keymap": {
"layer_count": 3
},
"encoder": { "encoder": {
"rotary": [{ "pin_a": "C4", "pin_b": "C3" }] "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
}, },

View file

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

View file

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

View file

@ -21,6 +21,3 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
/* EEPROM for via */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -58,5 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -10,6 +10,9 @@
}, },
"processor": "atmega32u2", "processor": "atmega32u2",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"dynamic_keymap": {
"layer_count": 3
},
"community_layouts": ["tkl_ansi"], "community_layouts": ["tkl_ansi"],
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {

View file

@ -20,5 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 18 #define MATRIX_COLS 18
#define DYNAMIC_KEYMAP_LAYER_COUNT 3 // not enough memory for a 4th layer with VIA

View file

@ -1,6 +1,9 @@
{ {
"keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013", "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "C6", "caps_lock": "C6",
"scroll_lock": "C5", "scroll_lock": "C5",

View file

@ -20,5 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 18 #define MATRIX_COLS 18
#define DYNAMIC_KEYMAP_LAYER_COUNT 3 // not enough memory for a 4th layer with VIA

View file

@ -1,6 +1,9 @@
{ {
"keyboard_name": "Majestouch TKL The Pegasus Hoof 2015", "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "C6", "caps_lock": "C6",
"scroll_lock": "C5", "scroll_lock": "C5",

View file

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

View file

@ -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
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64

View file

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

View file

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

View file

@ -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_PAL_MODE 0
#define WS2812_SPI_SCK_PIN B13 #define WS2812_SPI_SCK_PIN B13
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.

View file

@ -36,5 +36,3 @@
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -13,6 +13,9 @@
"rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"] "rows": ["D1", "D0", "D3", "D2", "D6", "D4", "D7", "B4", "B5", "B6", "C6", "C7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "D5", "caps_lock": "D5",
"num_lock": "B7", "num_lock": "B7",

View file

@ -37,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -13,6 +13,9 @@
"rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"] "rows": ["D3", "F5", "F4", "F0", "B7", "B2", "E6", "B0"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "F7", "caps_lock": "F7",
"scroll_lock": "F6", "scroll_lock": "F6",

View file

@ -52,5 +52,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -13,6 +13,9 @@
"bootmagic": { "bootmagic": {
"matrix": [0, 5] "matrix": [0, 5]
}, },
"dynamic_keymap": {
"layer_count": 3
},
"qmk_lufa_bootloader": { "qmk_lufa_bootloader": {
"esc_output": "D6", "esc_output": "D6",
"esc_input": "D7", "esc_input": "D7",

View file

@ -58,5 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -13,6 +13,9 @@
"levels": 5, "levels": 5,
"breathing": true "breathing": true
}, },
"dynamic_keymap": {
"layer_count": 3
},
"qmk_lufa_bootloader": { "qmk_lufa_bootloader": {
"esc_input": "F0", "esc_input": "F0",
"esc_output": "E6", "esc_output": "E6",

View file

@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
/* Maximum dynamic keymap layers (constrained by EEPROM space) */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 8
#define MATRIX_COLS 16 #define MATRIX_COLS 16

View file

@ -8,6 +8,9 @@
"pid": "0x980C", "pid": "0x980C",
"device_version": "1.0.0" "device_version": "1.0.0"
}, },
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "B5", "caps_lock": "B5",
"num_lock": "B4", "num_lock": "B4",

View file

@ -24,5 +24,3 @@
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -33,6 +33,9 @@
"rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"] "rows": ["A4", "B10", "B2", "B1", "B0", "B15", "B13", "B14", "B12", "A10", "A9", "A8"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"dynamic_keymap": {
"layer_count": 3
},
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "B3", "pin_b": "B5"}, {"pin_a": "B3", "pin_b": "B5"},

View file

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

View file

@ -22,6 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
/* reduce EEPROM usage */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define LAYER_STATE_8BIT #define LAYER_STATE_8BIT

View file

@ -13,6 +13,9 @@
"rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"] "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "B1", "caps_lock": "B1",
"num_lock": "B2", "num_lock": "B2",

View file

@ -75,4 +75,3 @@
#define RGB_MATRIX_LED_COUNT 108 #define RGB_MATRIX_LED_COUNT 108
#define DRIVER_INDICATOR_LED_TOTAL 0 #define DRIVER_INDICATOR_LED_TOTAL 0
#endif #endif
#define DYNAMIC_KEYMAP_LAYER_COUNT 2

View file

@ -75,4 +75,3 @@
#define RGB_MATRIX_LED_COUNT 109 #define RGB_MATRIX_LED_COUNT 109
#define DRIVER_INDICATOR_LED_TOTAL 0 #define DRIVER_INDICATOR_LED_TOTAL 0
#endif #endif
#define DYNAMIC_KEYMAP_LAYER_COUNT 2

View file

@ -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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -7,6 +7,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"features": { "features": {
"rgblight": true, "rgblight": true,
"backlight": true "backlight": true

View file

@ -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 RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -7,6 +7,9 @@
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 3
},
"features": { "features": {
"rgblight": true, "rgblight": true,
"backlight": true "backlight": true

View file

@ -21,6 +21,3 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
/* Reducing layer count to 3 for via support */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -17,6 +17,9 @@
"caps_lock": "B0", "caps_lock": "B0",
"num_lock": "D1" "num_lock": "D1"
}, },
"dynamic_keymap": {
"layer_count": 3
},
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"layouts": { "layouts": {

View file

@ -21,6 +21,3 @@
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
/* Reducing layer count to 3 for via support */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -18,6 +18,9 @@
"pin": "D6", "pin": "D6",
"levels": 6 "levels": 6
}, },
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "B7", "caps_lock": "B7",
"num_lock": "C6" "num_lock": "C6"

View file

@ -24,6 +24,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9

View file

@ -11,6 +11,9 @@
"backlight": { "backlight": {
"pin": "D4" "pin": "D4"
}, },
"dynamic_keymap": {
"layer_count": 3
},
"rgblight": { "rgblight": {
"led_count": 18, "led_count": 18,
"sleep": true, "sleep": true,

View file

@ -14,9 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
/* Use 3 dynamic keymap layers */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
/* i2C Config */ /* i2C Config */
#define I2C_DRIVER I2CD1 #define I2C_DRIVER I2CD1
#define I2C1_SCL_PIN B6 #define I2C1_SCL_PIN B6

View file

@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #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 */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View file

@ -17,6 +17,9 @@
"pin": "B7", "pin": "B7",
"breathing": true "breathing": true
}, },
"dynamic_keymap": {
"layer_count": 3
},
"indicators": { "indicators": {
"caps_lock": "F0", "caps_lock": "F0",
"num_lock": "F1" "num_lock": "F1"

View file

@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #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 */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */

View file

@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 2
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.

View file

@ -28,5 +28,3 @@
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */ /* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE #define LOCKING_RESYNC_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 3

View file

@ -12,6 +12,9 @@
"pin": "B7", "pin": "B7",
"breathing": true "breathing": true
}, },
"dynamic_keymap": {
"layer_count": 3
},
"rgblight": { "rgblight": {
"led_count": 4 "led_count": 4
}, },

View file

@ -27,9 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Mouse Keys Combined mode */ /* Mouse Keys Combined mode */
//#define MK_COMBINED //#define MK_COMBINED
/* Layer Count */
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.