Skip to content

Commit

Permalink
Userspace post_rules.mk migration step qmk#3
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vomindoraan committed Sep 16, 2021
1 parent 455856f commit 8c9a7c1
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 9 deletions.
8 changes: 6 additions & 2 deletions keyboards/atreus/keymaps/ridingqwerty/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ 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
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
4 changes: 3 additions & 1 deletion keyboards/crkbd/keymaps/ninjonas/rules.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion keyboards/pinky/3/keymaps/ninjonas/rules.mk
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 6 additions & 2 deletions keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion keyboards/tada68/keymaps/jarred/rules.mk
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 8c9a7c1

Please sign in to comment.