diff options
author | QMK Bot <[email protected]> | 2024-12-27 19:25:25 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2024-12-27 19:25:25 +0000 |
commit | 4d3d8887e798bc25604a734e248278e9a3ccef49 (patch) | |
tree | 75feb1c75d25f61076d1f3a8525faa57ec8b28bd /keyboards | |
parent | 93de5335803242f1df93600602ef5725d4df3a4c (diff) | |
parent | 5593e73ba71fa31155cdb81bc7c477f6501065e6 (diff) | |
download | qmk_firmware-4d3d8887e798bc25604a734e248278e9a3ccef49.tar.gz qmk_firmware-4d3d8887e798bc25604a734e248278e9a3ccef49.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/tzarc/djinn/graphics/theme_djinn_default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c index f321308ac5..c651cd660d 100644 --- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c +++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c @@ -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"; } |