diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-10 03:32:53 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-10 03:32:53 +0000 |
commit | 504c00c2e14ca4eb0c033063e434323ad81c1b16 (patch) | |
tree | a175b111f67f5ab17463a93b7fdbcf7acc5bfd0b | |
parent | fc10e5e6b96bfee63950f27ff9edbb8bb216bbac (diff) | |
parent | 2cb9219a3e655218f5380a41cf5bc5e3135caaa1 (diff) | |
download | qmk_firmware-504c00c2e14ca4eb0c033063e434323ad81c1b16.tar.gz qmk_firmware-504c00c2e14ca4eb0c033063e434323ad81c1b16.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/atreus62/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/bantam44/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/chimera_ergo/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/chimera_ls/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/chimera_ortho/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/comet46/rules.mk | 1 | ||||
-rwxr-xr-x | keyboards/dichotomy/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/gh60/revc/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/handwired/retro_refit/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/hhkb/ansi/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/hhkb/jp/rules.mk | 1 | ||||
-rwxr-xr-x | keyboards/honeycomb/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/jd40/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/mitosis/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/numatreus/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/ok60/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/redox_w/rules.mk | 1 |
17 files changed, 0 insertions, 17 deletions
diff --git a/keyboards/atreus62/rules.mk b/keyboards/atreus62/rules.mk index 10bacba0af..5ca2da0312 100644 --- a/keyboards/atreus62/rules.mk +++ b/keyboards/atreus62/rules.mk @@ -23,7 +23,6 @@ COMMAND_ENABLE = yes # 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 #BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality UNICODE_ENABLE = yes # Unicode -#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend diff --git a/keyboards/bantam44/rules.mk b/keyboards/bantam44/rules.mk index 88533bacbe..ab333488a7 100644 --- a/keyboards/bantam44/rules.mk +++ b/keyboards/bantam44/rules.mk @@ -25,4 +25,3 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk index 59af1ede0a..7d69575ef8 100644 --- a/keyboards/chimera_ergo/rules.mk +++ b/keyboards/chimera_ergo/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk index f443b3866c..bc2c3099e8 100644 --- a/keyboards/chimera_ls/rules.mk +++ b/keyboards/chimera_ls/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk index ebdd2dc15a..dadb15fb68 100644 --- a/keyboards/chimera_ortho/rules.mk +++ b/keyboards/chimera_ortho/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk index 08acbefe1a..128a74e45f 100644 --- a/keyboards/comet46/rules.mk +++ b/keyboards/comet46/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # project specific files SRC += matrix.c \ diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index fe5ed813e9..97389e9c66 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -27,7 +27,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk index da064bc648..847fc39f11 100644 --- a/keyboards/gh60/revc/rules.mk +++ b/keyboards/gh60/revc/rules.mk @@ -26,6 +26,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https: # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_tsangan_hhkb diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk index 067f55d2c8..2ab82a669f 100644 --- a/keyboards/handwired/retro_refit/rules.mk +++ b/keyboards/handwired/retro_refit/rules.mk @@ -26,4 +26,3 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https: # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index 56c7fd7719..5a7349e7a4 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -26,7 +26,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = yes # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index 1902cf4325..8da5da9c13 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -26,7 +26,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = yes # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk index fe5ed813e9..97389e9c66 100755 --- a/keyboards/honeycomb/rules.mk +++ b/keyboards/honeycomb/rules.mk @@ -27,7 +27,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/jd40/rules.mk b/keyboards/jd40/rules.mk index 954d22b020..e7c9b90811 100644 --- a/keyboards/jd40/rules.mk +++ b/keyboards/jd40/rules.mk @@ -26,5 +26,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https: # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable RGB Underglow diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk index 1dae507120..456b9a6aa9 100644 --- a/keyboards/mitosis/rules.mk +++ b/keyboards/mitosis/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = yes # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # # project specific files SRC += matrix.c serial_uart.c diff --git a/keyboards/numatreus/rules.mk b/keyboards/numatreus/rules.mk index adfe4d977b..304e74175f 100644 --- a/keyboards/numatreus/rules.mk +++ b/keyboards/numatreus/rules.mk @@ -22,7 +22,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # 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 UNICODE_ENABLE = yes # Unicode -#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID #TAP_DANCE_ENABLE = yes RGBLIGHT_ENABLE = no LED_ANIMATIONS = no diff --git a/keyboards/ok60/rules.mk b/keyboards/ok60/rules.mk index 203b66f743..c7555c0ea9 100644 --- a/keyboards/ok60/rules.mk +++ b/keyboards/ok60/rules.mk @@ -25,6 +25,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable the RGB backlight MIDI_ENABLE = no # MIDI support # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID LAYOUTS = 60_ansi 60_iso 60_hhkb diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk index 59af1ede0a..7d69575ef8 100644 --- a/keyboards/redox_w/rules.mk +++ b/keyboards/redox_w/rules.mk @@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID # # project specific files SRC += matrix.c serial_uart.c |