From 8c9a7c1323801622dfef938e9518785b35ba7b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20=C4=90or=C4=91evi=C4=87?= Date: Wed, 8 Sep 2021 03:30:06 +0200 Subject: [PATCH] Userspace post_rules.mk migration step #3 Disable flags in keymap-level rules.mk that clash with userspace-level defaults We want all affected keymaps to compile to the exact same binaries as before the migration. Since keymap-level flags now override userspace flags rather than vice-versa, we need to make sure that we disable keymap flags that explicitly differ from the userspace defaults. --- keyboards/atreus/keymaps/ridingqwerty/rules.mk | 8 ++++++-- keyboards/crkbd/keymaps/ninjonas/rules.mk | 4 +++- .../kingly_keys/little_foot/keymaps/yanfali/rules.mk | 4 +++- keyboards/pinky/3/keymaps/ninjonas/rules.mk | 4 +++- keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk | 4 +++- keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk | 8 ++++++-- keyboards/tada68/keymaps/jarred/rules.mk | 4 +++- 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/keyboards/atreus/keymaps/ridingqwerty/rules.mk b/keyboards/atreus/keymaps/ridingqwerty/rules.mk index ecead0e01bce..b0c7780f6fff 100644 --- a/keyboards/atreus/keymaps/ridingqwerty/rules.mk +++ b/keyboards/atreus/keymaps/ridingqwerty/rules.mk @@ -9,7 +9,9 @@ BOOTLOADER = stm32-dfu # comment out to disable the options. # BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -17,6 +19,8 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # USB Nkey Rollover AUDIO_ENABLE = yes # Doot RGBLIGHT_ENABLE = no -TAP_DANCE_ENABLE = no +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#TAP_DANCE_ENABLE = no UNICODE_ENABLE = no UNICODEMAP_ENABLE = yes diff --git a/keyboards/crkbd/keymaps/ninjonas/rules.mk b/keyboards/crkbd/keymaps/ninjonas/rules.mk index c40a827798ac..dbe8d018e696 100644 --- a/keyboards/crkbd/keymaps/ninjonas/rules.mk +++ b/keyboards/crkbd/keymaps/ninjonas/rules.mk @@ -1,5 +1,7 @@ RGB_MATRIX_ENABLE = yes -MOUSEKEY_ENABLE = no +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#MOUSEKEY_ENABLE = no OLED_ENABLE = yes OLED_DRIVER = SSD1306 LTO_ENABLE = yes diff --git a/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk b/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk index a61cff275046..9e4a3029712c 100644 --- a/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk +++ b/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk @@ -1,4 +1,6 @@ CTPC=yes CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration -AUDIO_ENABLE = yes +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#AUDIO_ENABLE = yes diff --git a/keyboards/pinky/3/keymaps/ninjonas/rules.mk b/keyboards/pinky/3/keymaps/ninjonas/rules.mk index 8d32e2248699..27bcf60cc42a 100644 --- a/keyboards/pinky/3/keymaps/ninjonas/rules.mk +++ b/keyboards/pinky/3/keymaps/ninjonas/rules.mk @@ -1,2 +1,4 @@ -MOUSEKEY_ENABLE = no +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#MOUSEKEY_ENABLE = no LTO_ENABLE = yes diff --git a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk index 8846907559e7..99d5fbde5a3c 100644 --- a/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk @@ -6,7 +6,9 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # RGB Options RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not enable with RGB Matrix -RGBLIGHT_ANIMATIONS = no # LED animations +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#RGBLIGHT_ANIMATIONS = no # LED animations LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk index d484c4736694..6fa7ae5d254c 100644 --- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk @@ -6,9 +6,13 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix RGBLIGHT_ANIMATIONS = yes # LED animations RGBLIGHT_SPLIT_ENABLE = no # Split RGBLight Support RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight diff --git a/keyboards/tada68/keymaps/jarred/rules.mk b/keyboards/tada68/keymaps/jarred/rules.mk index 193d92d1d067..b68d0bdb45f2 100644 --- a/keyboards/tada68/keymaps/jarred/rules.mk +++ b/keyboards/tada68/keymaps/jarred/rules.mk @@ -1,2 +1,4 @@ -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +# MAINTAINERS' NOTE: The following flag has been disabled because it clashes with the default value set in your userspace rules.mk (see that file for more info). +# If you're sure you want to change the behavior that your keymap has had thus far, you may uncomment the following line and delete this note. +#MOUSEKEY_ENABLE = yes # Mouse keys(+4700) CONSOLE_ENABLE = no # Console for debug(+400)