diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-22 13:55:48 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-22 13:55:48 -0700 |
| commit | 4093732581b20e861d63d4c85054417a5e690915 (patch) | |
| tree | da090b451bf6a719709d23d7d5ca5008ef39dd48 | |
| parent | 45ec15d1c38cbd5f887854ae04f736575dd5a1f4 (diff) | |
| parent | 1aaef6c9884822a3abecf2e664af9bb21e0000c3 (diff) | |
| download | qmk_firmware-4093732581b20e861d63d4c85054417a5e690915.tar.gz qmk_firmware-4093732581b20e861d63d4c85054417a5e690915.zip | |
Merge remote-tracking branch 'upstream/master' into develop
| -rw-r--r-- | keyboards/canary/canary60rgb/v1/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/kiwikeebs/macro_v2/rules.mk | 3 | ||||
| -rwxr-xr-x | keyboards/kprepublic/bm43hsrgb/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/mode/m65s/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/mokey/mokey63/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/nix_studio/oxalys80/rules.mk | 1 |
6 files changed, 1 insertions, 8 deletions
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk index 31d83651ff..24f7f48263 100644 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ b/keyboards/canary/canary60rgb/v1/rules.mk @@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3733 diff --git a/keyboards/kiwikeebs/macro_v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk index c1524daac2..41aae09aab 100644 --- a/keyboards/kiwikeebs/macro_v2/rules.mk +++ b/keyboards/kiwikeebs/macro_v2/rules.mk @@ -16,6 +16,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes
\ No newline at end of file +ENCODER_ENABLE = yes diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk index 4e9c7bd62e..bd1d0e5ef7 100755 --- a/keyboards/kprepublic/bm43hsrgb/rules.mk +++ b/keyboards/kprepublic/bm43hsrgb/rules.mk @@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output KEY_LOCK_ENABLE = no # Enable KC_LOCK support diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk index c74e1db161..6308c54dde 100644 --- a/keyboards/mode/m65s/rules.mk +++ b/keyboards/mode/m65s/rules.mk @@ -15,7 +15,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output EEPROM_DRIVER = i2c # Enter lower-power sleep mode when on the ChibiOS idle thread diff --git a/keyboards/mokey/mokey63/rules.mk b/keyboards/mokey/mokey63/rules.mk index c7ccf409f1..3105d59b77 100644 --- a/keyboards/mokey/mokey63/rules.mk +++ b/keyboards/mokey/mokey63/rules.mk @@ -18,6 +18,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/nix_studio/oxalys80/rules.mk b/keyboards/nix_studio/oxalys80/rules.mk index 3da643f9ff..998e0ad73d 100644 --- a/keyboards/nix_studio/oxalys80/rules.mk +++ b/keyboards/nix_studio/oxalys80/rules.mk @@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes |