Browse Source

Integrate WS2812 code into quantum core

pull/106/head
Yang Liu 8 years ago
parent
commit
ba9ac457b2
7 changed files with 8 additions and 15 deletions
  1. +1
    -7
      keyboard/planck/Makefile
  2. +0
    -6
      keyboard/planck/config.h
  3. +0
    -0
      quantum/light_ws2812.c
  4. +0
    -0
      quantum/light_ws2812.h
  5. +7
    -2
      quantum/quantum.mk
  6. +0
    -0
      quantum/rgblight.c
  7. +0
    -0
      quantum/rgblight.h

+ 1
- 7
keyboard/planck/Makefile View File

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


+ 0
- 6
keyboard/planck/config.h View File

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


keyboard/planck/light_ws2812.c → quantum/light_ws2812.c View File


keyboard/planck/light_ws2812.h → quantum/light_ws2812.h View File


+ 7
- 2
quantum/quantum.mk View File

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

keyboard/planck/rgblight.c → quantum/rgblight.c View File


keyboard/planck/rgblight.h → quantum/rgblight.h View File


Loading…
Cancel
Save