From 8a8a180558c89afa09a448ad279e7166b1976532 Mon Sep 17 00:00:00 2001 From: mawaeg <62243375+mawaeg@users.noreply.github.com> Date: Sun, 29 Jun 2025 17:44:09 +0200 Subject: [PATCH] Use rgb_matrix_get_mode_name instead of name generation --- keyboards/mawaeg/sharkropad/config.h | 2 ++ keyboards/mawaeg/sharkropad/sharkropad.c | 43 +++--------------------- 2 files changed, 6 insertions(+), 39 deletions(-) diff --git a/keyboards/mawaeg/sharkropad/config.h b/keyboards/mawaeg/sharkropad/config.h index da88e14a375..2e57c56f0f0 100644 --- a/keyboards/mawaeg/sharkropad/config.h +++ b/keyboards/mawaeg/sharkropad/config.h @@ -26,3 +26,5 @@ #define WS2812_PWM_PAL_MODE 1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 #define WS2812_PWM_DMA_CHANNEL 4 + +#define RGB_MATRIX_MODE_NAME_ENABLE diff --git a/keyboards/mawaeg/sharkropad/sharkropad.c b/keyboards/mawaeg/sharkropad/sharkropad.c index d0ee405321b..391f59800ba 100644 --- a/keyboards/mawaeg/sharkropad/sharkropad.c +++ b/keyboards/mawaeg/sharkropad/sharkropad.c @@ -19,49 +19,12 @@ #include #include -#if defined(RGB_MATRIX_EFFECT) -# undef RGB_MATRIX_EFFECT -#endif // defined(RGB_MATRIX_EFFECT) - -#define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x, -enum { - RGB_MATRIX_EFFECT_NONE, -#include "rgb_matrix_effects.inc" -#ifdef RGB_MATRIX_CUSTOM_KB -# include "rgb_matrix_kb.inc" -#endif // RGB_MATRIX_CUSTOM_KB -#ifdef RGB_MATRIX_CUSTOM_USER -# include "rgb_matrix_user.inc" -#endif // RGB_MATRIX_CUSTOM_USER -#undef RGB_MATRIX_EFFECT -}; - -#define RGB_MATRIX_EFFECT(x) \ - case RGB_MATRIX_EFFECT_##x: \ - return #x; -const char *rgb_matrix_name(uint8_t effect) { - switch (effect) { - case RGB_MATRIX_EFFECT_NONE: - return "NONE"; -#include "rgb_matrix_effects.inc" -#ifdef RGB_MATRIX_CUSTOM_KB -# include "rgb_matrix_kb.inc" -#endif // RGB_MATRIX_CUSTOM_KB -#ifdef RGB_MATRIX_CUSTOM_USER -# include "rgb_matrix_user.inc" -#endif // RGB_MATRIX_CUSTOM_USER -#undef RGB_MATRIX_EFFECT - default: - return "UNKNOWN"; - } -} - static uint8_t effect_name_len = 0; const char *rgb_matrix_get_effect_name(void) { static char buf[32] = {0}; - snprintf(buf, sizeof(buf), "%s", rgb_matrix_name(rgb_matrix_get_mode())); + snprintf(buf, sizeof(buf), "%s", rgb_matrix_get_mode_name(rgb_matrix_get_mode())); for (uint8_t i = 1; i < sizeof(buf); ++i) { if (buf[i] == 0) { effect_name_len = i; @@ -77,7 +40,9 @@ const char *rgb_matrix_get_effect_name(void) { } bool oled_task_kb(void) { - if (!oled_task_user()) { return false; } + if (!oled_task_user()) { + return false; + } static uint8_t last_effect = 0; static uint8_t last_speed = 0;