g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #972 from mechkeys/rgb_compat 

Add extern for 'led' global, set 'weak' attribute for rgblight_set()
daktil_thumb_popravljen
Jack Humbert 2016-12-29 21:42:16 -05:00 committed by GitHub
parent 223cffd92f b8e74c378b
commit 8a76075ca7
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quantum/rgblight.c
View File

@ -370,6 +370,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
rgblight_set(); rgblight_set();
} }
__attribute__ ((weak))
void rgblight_set(void) { void rgblight_set(void) {
if (rgblight_config.enable) { if (rgblight_config.enable) {
#ifdef RGBW #ifdef RGBW

2
quantum/rgblight.h
View File

@ -40,6 +40,8 @@
#include "eeconfig.h" #include "eeconfig.h"
#include "light_ws2812.h" #include "light_ws2812.h"
extern LED_TYPE led[RGBLED_NUM];
extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM;
extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM;
extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM;