Integrate WS2812 code into quantum core

cominchu · Jan 25, 2016 · ba9ac45 · ba9ac45
1 parent 0a40654
commit ba9ac45
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 15 deletions.
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile
@@ -143,18 +143,12 @@ BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 # AUDIO_ENABLE = YES 		# Audio output on port C6
 # UNICODE_ENABLE = YES 		# Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes # Enable WS2812 bottom RGB light
+RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.  Do not enable this with MIDI at the same time.
 
 ifdef BACKLIGHT_ENABLE
 	SRC += backlight.c
 endif
 
-ifdef RGBLIGHT_ENABLE
-	SRC += light_ws2812.c
-	SRC += rgblight.c
-	OPT_DEFS += -DRGBLIGHT_ENABLE
-endif
-
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax

diff --git a/keyboard/planck/config.h b/keyboard/planck/config.h
@@ -63,15 +63,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ws2812_DDRREG   DDRD
 #define ws2812_pin PD1
 #define RGBLED_NUM 28     // Number of LEDs
-#ifndef RGBLIGHT_HUE_STEP
 #define RGBLIGHT_HUE_STEP 10
-#endif
-#ifndef RGBLIGHT_SAT_STEP
 #define RGBLIGHT_SAT_STEP 17
-#endif
-#ifndef RGBLIGHT_VAL_STEP
 #define RGBLIGHT_VAL_STEP 17
-#endif
 
 /*
  * Feature disable options

diff --git a/keyboard/planck/light_ws2812.c → quantum/light_ws2812.c b/keyboard/planck/light_ws2812.c → quantum/light_ws2812.c
diff --git a/keyboard/planck/light_ws2812.h → quantum/light_ws2812.h b/keyboard/planck/light_ws2812.h → quantum/light_ws2812.h
diff --git 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
-
diff --git a/keyboard/planck/rgblight.c → quantum/rgblight.c b/keyboard/planck/rgblight.c → quantum/rgblight.c
diff --git a/keyboard/planck/rgblight.h → quantum/rgblight.h b/keyboard/planck/rgblight.h → quantum/rgblight.h