drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2024-12-27 19:25:25 +00:00
commit 4d3d8887e7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/tzarc/djinn/graphics/theme_djinn_default.c
View file

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