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

This commit is contained in:
QMK Bot 2025-06-07 04:09:31 +00:00
commit e3c8c23d91
2 changed files with 12 additions and 0 deletions

View File

@ -33,6 +33,9 @@ enum {
#ifdef RGB_MATRIX_CUSTOM_USER #ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
#endif #endif
#if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
# include "rgb_matrix_community_modules.inc"
#endif
}; };
#define RGB_MATRIX_EFFECT(x) \ #define RGB_MATRIX_EFFECT(x) \
@ -49,6 +52,9 @@ const char* rgb_matrix_name(uint8_t effect) {
#endif #endif
#ifdef RGB_MATRIX_CUSTOM_USER #ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
#endif
#if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
# include "rgb_matrix_community_modules.inc"
#endif #endif
default: default:
return "UNKNOWN"; return "UNKNOWN";

View File

@ -49,6 +49,9 @@ enum {
# ifdef RGB_MATRIX_CUSTOM_USER # ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
# endif # endif
# if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
# include "rgb_matrix_community_modules.inc"
# endif
# undef RGB_MATRIX_EFFECT # undef RGB_MATRIX_EFFECT
}; };
@ -66,6 +69,9 @@ const char *rgb_matrix_name(uint8_t effect) {
# ifdef RGB_MATRIX_CUSTOM_USER # ifdef RGB_MATRIX_CUSTOM_USER
# include "rgb_matrix_user.inc" # include "rgb_matrix_user.inc"
# endif # endif
# if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
# include "rgb_matrix_community_modules.inc"
# endif
# undef RGB_MATRIX_EFFECT # undef RGB_MATRIX_EFFECT
default: default:
return "UNKNOWN"; return "UNKNOWN";