summaryrefslogtreecommitdiff
path: root/keyboard/planck
diff options
context:
space:
mode:
authorIBNobody <protospherex@gmail.com>2016-04-15 14:42:50 -0500
committerIBNobody <protospherex@gmail.com>2016-04-15 14:42:50 -0500
commit8f85117aa9e060371177e3b523bc89dc7aad19e8 (patch)
tree9a577e08efd6e1a5d8779fa27c257fdf687ae42f /keyboard/planck
parent39e520c010072aa17c0bcb2c5bfbbee08e010170 (diff)
Added Audio to my Atomic
Diffstat (limited to 'keyboard/planck')
-rw-r--r--keyboard/planck/Makefile31
1 files changed, 1 insertions, 30 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
index c8517e756f..83b8303b02 100644
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@@ -157,39 +157,10 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
ifdef KEYMAP
-<<<<<<< HEAD
-<<<<<<< HEAD
-# Build Options
-# comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = yes # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
-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
-# MIDI_ENABLE = yes # MIDI controls
-# AUDIO_ENABLE = yes # Audio output on port C6
-# UNICODE_ENABLE = yes # Unicode
-# BLUETOOTH_ENABLE = ye # Enable Bluetooth with the Adafruit EZ-Key HID
-# RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-
-
-ifdef BACKLIGHT_ENABLE
-=======
-ifeq ($(BACKLIGHT_ENABLE), yes)
->>>>>>> master
- SRC += backlight.c
-=======
ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
include keymaps/$(KEYMAP)/makefile.mk
endif
->>>>>>> remotes/jackhumbert/new_defaults
endif
else
@@ -212,4 +183,4 @@ VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
VPATH += $(TMK_DIR)
-include $(TOP_DIR)/quantum/quantum.mk
+include $(TOP_DIR)/quantum/quantum.mk \ No newline at end of file