summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorToni2016-07-27 20:35:13 +0200
committerToni2016-07-27 20:35:13 +0200
commit9f21c0aa0618531cebc94a2af14d151b9357859f (patch)
treec9c3d632669206fe924c495d95608733082d6b3b /keyboards
parent5e2e8c89e86fbabb65737789ff0545e3e8ac1610 (diff)
parent93f366fa7d59d0a3abb03879da88082a1e2128a8 (diff)
Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/planck/keymaps/default/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/planck/keymaps/default/Makefile b/keyboards/planck/keymaps/default/Makefile
index 38a504a27..0f4953888 100644
--- a/keyboards/planck/keymaps/default/Makefile
+++ b/keyboards/planck/keymaps/default/Makefile
@@ -11,7 +11,7 @@ CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = yes # 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 = yes # Enable keyboard backlight functionality
-MIDI_ENABLE = yes # MIDI controls
+MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = yes # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
@@ -22,4 +22,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifndef QUANTUM_DIR
include ../../../../Makefile
-endif \ No newline at end of file
+endif