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

This commit is contained in:
QMK Bot 2024-12-27 19:25:58 +00:00
commit 36e76c977e

View File

@ -43,13 +43,13 @@ static painter_font_handle_t thintel;
enum {
RGB_MATRIX_EFFECT_NONE,
# include "rgb_matrix_effects.inc"
# undef RGB_MATRIX_EFFECT
# ifdef RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_kb.inc"
# endif
# ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc"
# endif
# undef RGB_MATRIX_EFFECT
};
# define RGB_MATRIX_EFFECT(x) \
@ -60,13 +60,13 @@ const char *rgb_matrix_name(uint8_t effect) {
case RGB_MATRIX_EFFECT_NONE:
return "NONE";
# include "rgb_matrix_effects.inc"
# undef RGB_MATRIX_EFFECT
# ifdef RGB_MATRIX_CUSTOM_KB
# include "rgb_matrix_kb.inc"
# endif
# ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc"
# endif
# undef RGB_MATRIX_EFFECT
default:
return "UNKNOWN";
}