~ruther/qmk_firmware

cf1749323c53b0bbf76c850f53a34f1550efaf74 — QMK Bot 3 years ago c97539e + 028edfc
Merge remote-tracking branch 'origin/master' into develop
M keyboards/dk60/rules.mk => keyboards/dk60/rules.mk +0 -1
@@ 19,5 19,4 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes
UNICODE_ENABLE = yes

M keyboards/fjlabs/ad65/rules.mk => keyboards/fjlabs/ad65/rules.mk +0 -1
@@ 22,4 22,3 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

M keyboards/fjlabs/bks65/rules.mk => keyboards/fjlabs/bks65/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi

M keyboards/fjlabs/bks65solder/rules.mk => keyboards/fjlabs/bks65solder/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi

M keyboards/fjlabs/bolsa65/rules.mk => keyboards/fjlabs/bolsa65/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi_blocker

M keyboards/fjlabs/kf87/rules.mk => keyboards/fjlabs/kf87/rules.mk +0 -1
@@ 22,4 22,3 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

M keyboards/fjlabs/ldk65/rules.mk => keyboards/fjlabs/ldk65/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi

M keyboards/fjlabs/ready100/rules.mk => keyboards/fjlabs/ready100/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 64_ansi

M keyboards/fjlabs/tf60ansi/rules.mk => keyboards/fjlabs/tf60ansi/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 60_ansi

M keyboards/fjlabs/tf60v2/rules.mk => keyboards/fjlabs/tf60v2/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 60_ansi_arrow

M keyboards/fjlabs/tf65rgbv2/rules.mk => keyboards/fjlabs/tf65rgbv2/rules.mk +2 -2
@@ 22,6 22,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi
\ No newline at end of file

LAYOUTS = 65_ansi

M keyboards/gh60/revc/keymaps/danbee/rules.mk => keyboards/gh60/revc/keymaps/danbee/rules.mk +0 -1
@@ 1,2 1,1 @@
MOUSEKEY_ENABLE = no
KEYBOARD_LOCK_ENABLE = yes

M keyboards/gh60/revc/rules.mk => keyboards/gh60/revc/rules.mk +0 -1
@@ 12,7 12,6 @@ MOUSEKEY_ENABLE = yes		# Mouse keys
EXTRAKEY_ENABLE = yes		# Audio control and System control
# CONSOLE_ENABLE = yes		# Console for debug
# COMMAND_ENABLE = yes		# Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
# SLEEP_LED_ENABLE = yes	# Breathing sleep LED during USB suspend
NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work

M keyboards/handwired/arrow_pad/rules.mk => keyboards/handwired/arrow_pad/rules.mk +0 -1
@@ 12,7 12,6 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
EXTRAKEY_ENABLE = yes       # Audio control and System control
CONSOLE_ENABLE = yes        # Console for debug
COMMAND_ENABLE = yes        # Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work

M keyboards/handwired/retro_refit/rules.mk => keyboards/handwired/retro_refit/rules.mk +0 -1
@@ 12,7 12,6 @@ MOUSEKEY_ENABLE = yes		# Mouse keys
EXTRAKEY_ENABLE = yes		# Audio control and System control
CONSOLE_ENABLE = yes		# Console for debug
COMMAND_ENABLE = yes		# Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
# SLEEP_LED_ENABLE = yes	# Breathing sleep LED during USB suspend
NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work

M keyboards/idb/idb_60/rules.mk => keyboards/idb/idb_60/rules.mk +0 -1
@@ 11,7 11,6 @@ MOUSEKEY_ENABLE = yes			# Mouse keys
EXTRAKEY_ENABLE = yes			# Audio control and System control
CONSOLE_ENABLE = no			# Console for debug
COMMAND_ENABLE = no			# Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = no		# Allow locking of keyboard via magic key
SLEEP_LED_ENABLE = no			# Breathing sleep LED during USB suspend
NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no			# Enable keyboard backlight functionality

M keyboards/jd40/rules.mk => keyboards/jd40/rules.mk +0 -1
@@ 12,7 12,6 @@ MOUSEKEY_ENABLE = yes		# Mouse keys
EXTRAKEY_ENABLE = yes		# Audio control and System control
# CONSOLE_ENABLE = yes		# Console for debug
# COMMAND_ENABLE = yes		# Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
# SLEEP_LED_ENABLE = yes	# Breathing sleep LED during USB suspend
NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work

M keyboards/kc60/keymaps/stanleylai/rules.mk => keyboards/kc60/keymaps/stanleylai/rules.mk +0 -2
@@ 8,7 8,6 @@ MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
CONSOLE_ENABLE = no         # Console for debug(+400)
COMMAND_ENABLE = no         # Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes 			 # Enable WS2812 underglow RGB strip
MIDI_ENABLE = no            # MIDI controls


@@ 19,4 18,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes           # USB Nkey Rollover


M keyboards/kc60/keymaps/wigguno/rules.mk => keyboards/kc60/keymaps/wigguno/rules.mk +0 -2
@@ 8,7 8,6 @@ MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
CONSOLE_ENABLE = no         # Console for debug(+400)
COMMAND_ENABLE = no         # Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work


@@ 18,4 17,3 @@ MIDI_ENABLE = no            # MIDI controls
UNICODE_ENABLE = no         # Unicode
BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no           # Audio output on port C6


M keyboards/kc60/rules.mk => keyboards/kc60/rules.mk +0 -1
@@ 19,6 19,5 @@ NKRO_ENABLE = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key

LAYOUTS = 60_ansi

M keyboards/keybee/keybee65/rules.mk => keyboards/keybee/keybee65/rules.mk +0 -1
@@ 19,7 19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes
ENCODER_ENABLE = no
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812

M keyboards/lucid/alexa/rules.mk => keyboards/lucid/alexa/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs

M keyboards/lucid/kbd8x_hs/rules.mk => keyboards/lucid/kbd8x_hs/rules.mk +0 -1
@@ 22,4 22,3 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

M keyboards/lucid/phantom_hs/rules.mk => keyboards/lucid/phantom_hs/rules.mk +0 -1
@@ 22,6 22,5 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 65_ansi_blocker

M keyboards/lucid/phantom_solder/rules.mk => keyboards/lucid/phantom_solder/rules.mk +0 -1
@@ 22,4 22,3 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

M keyboards/ok60/rules.mk => keyboards/ok60/rules.mk +0 -1
@@ 12,7 12,6 @@ MOUSEKEY_ENABLE = yes		# Mouse keys
EXTRAKEY_ENABLE = yes		# Audio control and System control
# CONSOLE_ENABLE = yes		# Console for debug
# COMMAND_ENABLE = yes		# Commands for debug and configuration
KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
NKRO_ENABLE = yes			# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes  # Enable the RGB backlight

M keyboards/thevankeyboards/minivan/keymaps/danbee/rules.mk => keyboards/thevankeyboards/minivan/keymaps/danbee/rules.mk +0 -1
@@ 1,2 1,1 @@
MOUSEKEY_ENABLE = no
KEYBOARD_LOCK_ENABLE = yes

M keyboards/undead60m/rules.mk => keyboards/undead60m/rules.mk +0 -1
@@ 19,6 19,5 @@ NKRO_ENABLE = no            # USB Nkey Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes
ENCODER_ENABLE = yes
LTO_ENABLE = yes

M keyboards/wolf/ts60/rules.mk => keyboards/wolf/ts60/rules.mk +2 -2
@@ 22,6 22,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
KEYBOARD_LOCK_ENABLE = yes

LAYOUTS = 60_ansi
\ No newline at end of file

LAYOUTS = 60_ansi

M show_options.mk => show_options.mk +0 -1
@@ 61,7 61,6 @@ OTHER_OPTION_NAMES = \
  HAPTIC_ENABLE \
  HHKB_RN42_ENABLE \
  ISSI_ENABLE \
  KEYBOARD_LOCK_ENABLE \
  KEYLOGGER_ENABLE \
  LCD_BACKLIGHT_ENABLE \
  MACROS_ENABLED \

M users/bcat/rules.mk => users/bcat/rules.mk +0 -1
@@ 29,7 29,6 @@ SLEEP_LED_ENABLE = no
# Disable other unused options on all keyboards.
AUTO_SHIFT_ENABLE = no
COMBO_ENABLE = no
KEYBOARD_LOCK_ENABLE = no
KEY_LOCK_ENABLE = no
LEADER_ENABLE = no
SWAP_HANDS_ENABLE = no