Merge branch 'develop'

1 files changed, 4 insertions, 54 deletions

diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index bf5209a9d3..3b45e82cb9 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -146,61 +146,11 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
 #        pragma message "You need to use a custom driver, or re-implement the WS2812 driver to use a different configuration."
 #    endif
 
-// LED color buffer
-rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_COUNT];
-bool      ws2812_dirty = false;
-
-static void init(void) {
-    ws2812_init();
-    ws2812_dirty = false;
-}
-
-static void flush(void) {
-    if (ws2812_dirty) {
-        ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_COUNT);
-        ws2812_dirty = false;
-    }
-}
-
-// Set an led in the buffer to a color
-static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
-#    if defined(RGB_MATRIX_SPLIT)
-    const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
-    if (!is_keyboard_left()) {
-        if (i >= k_rgb_matrix_split[0]) {
-            i -= k_rgb_matrix_split[0];
-        } else {
-            return;
-        }
-    } else if (i >= k_rgb_matrix_split[0]) {
-        return;
-    }
-#    endif
-
-    if (rgb_matrix_ws2812_array[i].r == r && rgb_matrix_ws2812_array[i].g == g && rgb_matrix_ws2812_array[i].b == b) {
-        return;
-    }
-
-    ws2812_dirty                 = true;
-    rgb_matrix_ws2812_array[i].r = r;
-    rgb_matrix_ws2812_array[i].g = g;
-    rgb_matrix_ws2812_array[i].b = b;
-#    ifdef WS2812_RGBW
-    convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]);
-#    endif
-}
-
-static void setled_all(uint8_t r, uint8_t g, uint8_t b) {
-    for (int i = 0; i < ARRAY_SIZE(rgb_matrix_ws2812_array); i++) {
-        setled(i, r, g, b);
-    }
-}
-
 const rgb_matrix_driver_t rgb_matrix_driver = {
-    .init          = init,
-    .flush         = flush,
-    .set_color     = setled,
-    .set_color_all = setled_all,
+    .init          = ws2812_init,
+    .flush         = ws2812_flush,
+    .set_color     = ws2812_set_color,
+    .set_color_all = ws2812_set_color_all,
 };
 
 #endif