summaryrefslogtreecommitdiff
path: root/keyboards/meira
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-12 05:28:01 +0000
committerQMK Bot <hello@qmk.fm>2021-09-12 05:28:01 +0000
commitbda8924795759e2d4c9e39fa5b6cdfe54145555c (patch)
tree529c5abcb165cc9e9c1c66137c3877311d3f0092 /keyboards/meira
parent1895151a9c71fb870cfc37233a7e89fe88379358 (diff)
parent5af17997359d91ee0a7340d1e17514fe8c8a46f1 (diff)
downloadqmk_firmware-bda8924795759e2d4c9e39fa5b6cdfe54145555c.tar.gz
qmk_firmware-bda8924795759e2d4c9e39fa5b6cdfe54145555c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/meira')
-rw-r--r--keyboards/meira/promicro/rules.mk2
-rw-r--r--keyboards/meira/rules.mk1
2 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/meira/promicro/rules.mk
index bbb8bda6b5..09057bea54 100644
--- a/keyboards/meira/promicro/rules.mk
+++ b/keyboards/meira/promicro/rules.mk
@@ -1,5 +1,3 @@
-BLUETOOTH_ENABLE = no
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index 1d6aacdaa3..d1eadc9921 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -17,7 +17,6 @@ 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 = no # USB Nkey Rollover
UNICODE_ENABLE = no # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE = no # Audio output on port C6
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
BACKLIGHT_DRIVER = custom