Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 7 insertions, 2 deletions

diff --git a/users/drashna/rgb_stuff.h b/users/drashna/rgb_stuff.h
index 6426ea266f..065bda9f9e 100644
--- a/users/drashna/rgb_stuff.h
+++ b/users/drashna/rgb_stuff.h
@@ -1,4 +1,8 @@
+#pragma once
 #include "quantum.h"
+#ifdef RGB_MATRIX_ENABLE
+  #include "rgb_matrix.h"
+#endif
 
 typedef struct {
     bool enabled;
@@ -12,5 +16,6 @@ void scan_rgblight_fadeout(void);
 void matrix_init_rgb(void);
 void matrix_scan_rgb(void);
 uint32_t layer_state_set_rgb(uint32_t state);
-
-
+uint32_t default_layer_state_set_rgb(uint32_t state);
+void rgblight_sethsv_default_helper(uint8_t index);
+void rgb_matrix_set_color_all( uint8_t red, uint8_t green, uint8_t blue );