Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

[qmk_firmware.git] / quantum / rgblight.h

diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index fd39ead09fcd97e59fb8717025e43c8450682fb0..def26c428cdf270ba14dc7f7e75ac4ed8fa25010 100644 (file)
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -1,8 +1,11 @@
 #ifndef RGBLIGHT_H
 #define RGBLIGHT_H
 
-#ifndef RGBLIGHT_MODES
-#define RGBLIGHT_MODES 23
+
+#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
+       #define RGBLIGHT_MODES 23
+#else
+       #define RGBLIGHT_MODES 1
 #endif
 
 #ifndef RGBLIGHT_EFFECT_SNAKE_LENGTH
@@ -13,7 +16,7 @@
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
 #endif
 #ifndef RGBLIGHT_EFFECT_KNIGHT_OFFSET
-#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 11
+#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
 #endif
 
 #ifndef RGBLIGHT_EFFECT_DUALKNIGHT_LENGTH
@@ -64,10 +67,9 @@ void rgblight_decrease_val(void);
 void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val);
 void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b);
 
-#define EECONFIG_RGBLIGHT (uint8_t *)7
 uint32_t eeconfig_read_rgblight(void);
-void eeconfig_write_rgblight(uint32_t val);
-void eeconfig_write_rgblight_default(void);
+void eeconfig_update_rgblight(uint32_t val);
+void eeconfig_update_rgblight_default(void);
 void eeconfig_debug_rgblight(void);
 
 void sethsv(uint16_t hue, uint8_t sat, uint8_t val, struct cRGB *led1);