mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-03 14:32:05 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e3c8c23d91
@ -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";
|
||||||
|
@ -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";
|
||||||
|
Loading…
Reference in New Issue
Block a user