drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Added Audio to my Atomic

Browse source
This commit is contained in:
IBNobody 2016-04-15 14:42:50 -05:00
parent 39e520c010
commit 8f85117aa9
6 changed files with 297 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

31
keyboard/planck/Makefile
View file

@ -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