Merge remote-tracking branch 'origin/master' into develop

2 files changed, 14 insertions, 0 deletions

diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 63c44001f6..4bc8a509f6 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -140,4 +140,8 @@
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
 
+#ifndef RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true
+#endif
+
 #endif
diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c
index 3074f8c20f..4f2ff86812 100644
--- a/keyboards/planck/rev6/rev6.c
+++ b/keyboards/planck/rev6/rev6.c
@@ -39,6 +39,16 @@ led_config_t g_led_config = { {
 //     6 5 4 3
 //        0
 //     7 8 1 2
+
+void suspend_power_down_kb(void) {
+    rgb_matrix_set_suspend_state(true);
+    suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+    rgb_matrix_set_suspend_state(false);
+    suspend_wakeup_init_user();
+}
 #endif
 
 void matrix_init_kb(void) {