From 4faddd3449ca553e0d8b02ba91f9a34b534eebe7 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 16 Jan 2016 00:06:51 -0500
Subject: working

---
 quantum/quantum.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index c82e478725..62d67be9f1 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -4,6 +4,21 @@ QUANTUM_DIR = quantum
 SRC += $(QUANTUM_DIR)/keymap_common.c \
 	$(QUANTUM_DIR)/led.c 
 
+ifdef KEYMAP
+ifneq (,$(shell grep USING_MIDI 'keymaps/keymap_$(KEYMAP).c'))
+MIDI_ENABLE=yes
+$(info  * Overriding MIDI_ENABLE setting - keymap_$(KEYMAP).c requires it)
+endif
+ifneq (,$(shell grep USING_UNICODE 'keymaps/keymap_$(KEYMAP).c'))
+UNICODE_ENABLE=yes
+$(info  * Overriding UNICODE_ENABLE setting - keymap_$(KEYMAP).c requires it)
+endif
+ifneq (,$(shell grep USING_BACKLIGHT 'keymaps/keymap_$(KEYMAP).c'))
+BACKLIGHT_ENABLE=yes
+$(info  * Overriding BACKLIGHT_ENABLE setting - keymap_$(KEYMAP).c requires it)
+endif
+endif
+
 ifndef CUSTOM_MATRIX
 	SRC += $(QUANTUM_DIR)/matrix.c
 endif
-- 
cgit v1.2.3


From dfe7004bc545ff7247a0dbef4788b9e1952f9c5d Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 16 Jan 2016 00:51:24 -0500
Subject: new keymap folder structure and makefile magic

---
 quantum/quantum.mk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 62d67be9f1..3a968a1459 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -4,18 +4,18 @@ QUANTUM_DIR = quantum
 SRC += $(QUANTUM_DIR)/keymap_common.c \
 	$(QUANTUM_DIR)/led.c 
 
-ifdef KEYMAP
-ifneq (,$(shell grep USING_MIDI 'keymaps/keymap_$(KEYMAP).c'))
+ifdef KEYMAP_FILE
+ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)'))
 MIDI_ENABLE=yes
-$(info  * Overriding MIDI_ENABLE setting - keymap_$(KEYMAP).c requires it)
+$(info  * Overriding MIDI_ENABLE setting - $(KEYMAP_FILE) requires it)
 endif
-ifneq (,$(shell grep USING_UNICODE 'keymaps/keymap_$(KEYMAP).c'))
+ifneq (,$(shell grep USING_UNICODE '$(KEYMAP_FILE)'))
 UNICODE_ENABLE=yes
-$(info  * Overriding UNICODE_ENABLE setting - keymap_$(KEYMAP).c requires it)
+$(info  * Overriding UNICODE_ENABLE setting - $(KEYMAP_FILE) requires it)
 endif
-ifneq (,$(shell grep USING_BACKLIGHT 'keymaps/keymap_$(KEYMAP).c'))
+ifneq (,$(shell grep USING_BACKLIGHT '$(KEYMAP_FILE)'))
 BACKLIGHT_ENABLE=yes
-$(info  * Overriding BACKLIGHT_ENABLE setting - keymap_$(KEYMAP).c requires it)
+$(info  * Overriding BACKLIGHT_ENABLE setting - $(KEYMAP_FILE) requires it)
 endif
 endif
 
-- 
cgit v1.2.3


From eb61700912f1713ba27d34c23d7f07be66ee6513 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 20 Jan 2016 00:06:52 -0500
Subject: better integrations

---
 quantum/quantum.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index c82e478725..81a53f2035 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -9,8 +9,11 @@ ifndef CUSTOM_MATRIX
 endif
 
 ifdef MIDI_ENABLE
-	SRC += $(QUANTUM_DIR)/keymap_midi.c \
-		   $(QUANTUM_DIR)/beeps.c
+	SRC += $(QUANTUM_DIR)/keymap_midi.c
+endif
+
+ifdef AUDIO_ENABLE
+	SRC += $(QUANTUM_DIR)/audio.c
 endif
 
 ifdef UNICODE_ENABLE
-- 
cgit v1.2.3


From a820533ab770e1919f190c102a091c1060f6302e Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 20 Jan 2016 00:15:29 -0500
Subject: keymap.c changes, disable grep stuff

---
 quantum/quantum.mk | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index 3a968a1459..a2b7d8db56 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -4,20 +4,20 @@ QUANTUM_DIR = quantum
 SRC += $(QUANTUM_DIR)/keymap_common.c \
 	$(QUANTUM_DIR)/led.c 
 
-ifdef KEYMAP_FILE
-ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)'))
-MIDI_ENABLE=yes
-$(info  * Overriding MIDI_ENABLE setting - $(KEYMAP_FILE) requires it)
-endif
-ifneq (,$(shell grep USING_UNICODE '$(KEYMAP_FILE)'))
-UNICODE_ENABLE=yes
-$(info  * Overriding UNICODE_ENABLE setting - $(KEYMAP_FILE) requires it)
-endif
-ifneq (,$(shell grep USING_BACKLIGHT '$(KEYMAP_FILE)'))
-BACKLIGHT_ENABLE=yes
-$(info  * Overriding BACKLIGHT_ENABLE setting - $(KEYMAP_FILE) requires it)
-endif
-endif
+# ifdef KEYMAP_FILE
+# ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)'))
+# MIDI_ENABLE=yes
+# $(info  * Overriding MIDI_ENABLE setting - $(KEYMAP_FILE) requires it)
+# endif
+# ifneq (,$(shell grep USING_UNICODE '$(KEYMAP_FILE)'))
+# UNICODE_ENABLE=yes
+# $(info  * Overriding UNICODE_ENABLE setting - $(KEYMAP_FILE) requires it)
+# endif
+# ifneq (,$(shell grep USING_BACKLIGHT '$(KEYMAP_FILE)'))
+# BACKLIGHT_ENABLE=yes
+# $(info  * Overriding BACKLIGHT_ENABLE setting - $(KEYMAP_FILE) requires it)
+# endif
+# endif
 
 ifndef CUSTOM_MATRIX
 	SRC += $(QUANTUM_DIR)/matrix.c
-- 
cgit v1.2.3


From ba9ac457b2159097ecfd9848c5171c52e3a68260 Mon Sep 17 00:00:00 2001
From: Yang Liu <i@yangliu.name>
Date: Sun, 24 Jan 2016 17:05:47 -0800
Subject: Integrate WS2812 code into quantum core

---
 quantum/quantum.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index df72241788..de93af7e8c 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -2,7 +2,7 @@ QUANTUM_DIR = quantum
 
 # # project specific files
 SRC += $(QUANTUM_DIR)/keymap_common.c \
-	$(QUANTUM_DIR)/led.c 
+	$(QUANTUM_DIR)/led.c
 
 # ifdef KEYMAP_FILE
 # ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)'))
@@ -35,6 +35,12 @@ ifdef UNICODE_ENABLE
 	SRC += $(QUANTUM_DIR)/keymap_unicode.c
 endif
 
+ifdef RGBLIGHT_ENABLE
+	SRC += $(QUANTUM_DIR)/light_ws2812.c
+	SRC += $(QUANTUM_DIR)/rgblight.c
+	OPT_DEFS += -DRGBLIGHT_ENABLE
+endif
+
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
 
@@ -45,4 +51,3 @@ include $(TMK_DIR)/protocol/lufa.mk
 
 include $(TMK_DIR)/common.mk
 include $(TMK_DIR)/rules.mk
-
-- 
cgit v1.2.3