aboutsummaryrefslogtreecommitdiff
path: root/keyboards/tzarc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tzarc')
-rw-r--r--keyboards/tzarc/djinn/config.h2
-rw-r--r--keyboards/tzarc/djinn/graphics/theme_djinn_default.c45
-rw-r--r--keyboards/tzarc/djinn/rules.mk2
-rw-r--r--keyboards/tzarc/ghoul/rules.mk2
4 files changed, 3 insertions, 48 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 24357b6a35..717ce4ee50 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -50,3 +50,5 @@
#ifndef STARTUP_SONG
# define STARTUP_SONG SONG(STARTUP_SOUND)
#endif // STARTUP_SONG
+
+#define RGB_MATRIX_MODE_NAME_ENABLE
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index c651cd660d..03535587c4 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -31,49 +31,6 @@ static painter_image_handle_t lock_scrl_off;
static painter_font_handle_t thintel;
//----------------------------------------------------------
-// RGB Matrix naming
-#if defined(RGB_MATRIX_ENABLE)
-# include <rgb_matrix.h>
-
-# if defined(RGB_MATRIX_EFFECT)
-# undef RGB_MATRIX_EFFECT
-# endif // defined(RGB_MATRIX_EFFECT)
-
-# define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
-enum {
- RGB_MATRIX_EFFECT_NONE,
-# include "rgb_matrix_effects.inc"
-# 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) \
- case RGB_MATRIX_EFFECT_##x: \
- return #x;
-const char *rgb_matrix_name(uint8_t effect) {
- switch (effect) {
- case RGB_MATRIX_EFFECT_NONE:
- return "NONE";
-# include "rgb_matrix_effects.inc"
-# 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";
- }
-}
-#endif // defined(RGB_MATRIX_ENABLE)
-
-//----------------------------------------------------------
// UI Initialisation
void keyboard_post_init_display(void) {
djinn_logo = qp_load_image_mem(gfx_djinn);
@@ -157,7 +114,7 @@ void draw_ui_user(bool force_redraw) {
if (hue_redraw || rgb_effect_redraw) {
static int max_rgb_xpos = 0;
xpos = 16;
- snprintf(buf, sizeof(buf), "rgb: %s", rgb_matrix_name(curr_effect));
+ snprintf(buf, sizeof(buf), "rgb: %s", rgb_matrix_get_mode_name(curr_effect));
for (int i = 5; i < sizeof(buf); ++i) {
if (buf[i] == 0)
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index d5060d9814..91dc4fe478 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -8,5 +8,3 @@ SRC += \
djinn_portscan_matrix.c \
djinn_split_sync.c \
djinn_usbpd.c
-
-DEFAULT_FOLDER = tzarc/djinn/rev2
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index 4bf96d9824..a9abdfe116 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_PAINTER_DRIVERS = ssd1351_spi
-DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
-
ANALOG_DRIVER_REQUIRED = yes