summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build_keyboard.mk8
-rwxr-xr-xkeyboards/ps2avrGB/program2
-rw-r--r--keyboards/ps2avrGB/rules.mk2
-rwxr-xr-xquantum/light_ws2812.h18
-rw-r--r--quantum/rgblight.c3
-rw-r--r--quantum/rgblight.h3
-rw-r--r--quantum/rgblight_types.h44
7 files changed, 57 insertions, 23 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk
index dc9e5dad63..550440cbcf 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -198,12 +198,14 @@ endif
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
OPT_DEFS += -DRGBLIGHT_ENABLE
-ifneq ($(strip $(DISABLE_WS2812)), yes)
- SRC += $(QUANTUM_DIR)/light_ws2812.c
-endif
SRC += $(QUANTUM_DIR)/rgblight.c
CIE1931_CURVE = yes
LED_BREATHING_TABLE = yes
+ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
+ OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER
+else
+ SRC += $(QUANTUM_DIR)/light_ws2812.c
+endif
endif
ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
diff --git a/keyboards/ps2avrGB/program b/keyboards/ps2avrGB/program
index a88d9cd9b0..081a8219ce 100755
--- a/keyboards/ps2avrGB/program
+++ b/keyboards/ps2avrGB/program
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.5
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
#
# This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/ps2avrGB/rules.mk b/keyboards/ps2avrGB/rules.mk
index 9fb27efed9..9e76993c4a 100644
--- a/keyboards/ps2avrGB/rules.mk
+++ b/keyboards/ps2avrGB/rules.mk
@@ -32,7 +32,7 @@ CONSOLE_ENABLE = yes
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = yes
-DISABLE_WS2812 = yes
+RGBLIGHT_CUSTOM_DRIVER = yes
OPT_DEFS = -DDEBUG_LEVEL=0
OPT_DEFS += -DBOOTLOADER_SIZE=2048
diff --git a/quantum/light_ws2812.h b/quantum/light_ws2812.h
index 60924a0fb6..f7e0c31440 100755
--- a/quantum/light_ws2812.h
+++ b/quantum/light_ws2812.h
@@ -28,23 +28,7 @@
//#include "ws2812_config.h"
//#include "i2cmaster.h"
-#ifdef RGBW
- #define LED_TYPE struct cRGBW
-#else
- #define LED_TYPE struct cRGB
-#endif
-
-
-/*
- * Structure of the LED array
- *
- * cRGB: RGB for WS2812S/B/C/D, SK6812, SK6812Mini, SK6812WWA, APA104, APA106
- * cRGBW: RGBW for SK6812RGBW
- */
-
-struct cRGB { uint8_t g; uint8_t r; uint8_t b; };
-struct cRGBW { uint8_t g; uint8_t r; uint8_t b; uint8_t w;};
-
+#include "rgblight_types.h"
/* User Interface
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 4eec2a7762..49420de376 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -364,7 +364,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
rgblight_set();
}
-__attribute__ ((weak))
+#ifndef RGBLIGHT_CUSTOM_DRIVER
void rgblight_set(void) {
if (rgblight_config.enable) {
#ifdef RGBW
@@ -385,6 +385,7 @@ void rgblight_set(void) {
#endif
}
}
+#endif
#ifdef RGBLIGHT_ANIMATIONS
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index 92130192ce..6b609da7fc 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -61,7 +61,10 @@
#include <stdint.h>
#include <stdbool.h>
#include "eeconfig.h"
+#ifndef RGBLIGHT_CUSTOM_DRIVER
#include "light_ws2812.h"
+#endif
+#include "rgblight_types.h"
extern LED_TYPE led[RGBLED_NUM];
diff --git a/quantum/rgblight_types.h b/quantum/rgblight_types.h
new file mode 100644
index 0000000000..1d1467a12a
--- /dev/null
+++ b/quantum/rgblight_types.h
@@ -0,0 +1,44 @@
+/*
+ * light weight WS2812 lib include
+ *
+ * Version 2.3 - Nev 29th 2015
+ * Author: Tim (cpldcpu@gmail.com)
+ *
+ * Please do not change this file! All configuration is handled in "ws2812_config.h"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RGBLIGHT_TYPES
+
+#include <avr/io.h>
+
+#ifdef RGBW
+ #define LED_TYPE struct cRGBW
+#else
+ #define LED_TYPE struct cRGB
+#endif
+
+
+/*
+ * Structure of the LED array
+ *
+ * cRGB: RGB for WS2812S/B/C/D, SK6812, SK6812Mini, SK6812WWA, APA104, APA106
+ * cRGBW: RGBW for SK6812RGBW
+ */
+
+struct cRGB { uint8_t g; uint8_t r; uint8_t b; };
+struct cRGBW { uint8_t g; uint8_t r; uint8_t b; uint8_t w;};
+
+#endif