REVERT ME: Move unicode.c, rgb.c, tap_dance.c to a subfolder in users…

…pace There's a conflicting `#include "unicode.h"` in quantum/keyboard.h (and other files), introduced by qmk#21659, which ends up including the userspace file instead of the intended core header
vomindoraan · Apr 18, 2024 · fdc2839 · fdc2839
1 parent 047e7cc
commit fdc2839
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/users/konstantin/rgb.c → users/konstantin/features/rgb.c b/users/konstantin/rgb.c → users/konstantin/features/rgb.c
diff --git a/users/konstantin/rgb.h → users/konstantin/features/rgb.h b/users/konstantin/rgb.h → users/konstantin/features/rgb.h
diff --git a/users/konstantin/tap_dance.c → users/konstantin/features/tap_dance.c b/users/konstantin/tap_dance.c → users/konstantin/features/tap_dance.c
diff --git a/users/konstantin/tap_dance.h → users/konstantin/features/tap_dance.h b/users/konstantin/tap_dance.h → users/konstantin/features/tap_dance.h
diff --git a/users/konstantin/unicode.c → users/konstantin/features/unicode.c b/users/konstantin/unicode.c → users/konstantin/features/unicode.c
diff --git a/users/konstantin/unicode.h → users/konstantin/features/unicode.h b/users/konstantin/unicode.h → users/konstantin/features/unicode.h
diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h
@@ -18,13 +18,13 @@
 
 #include "quantum.h"
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-    #include "rgb.h"
+    #include "features/rgb.h"
 #endif
 #ifdef TAP_DANCE_ENABLE
-    #include "tap_dance.h"
+    #include "features/tap_dance.h"
 #endif
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE)
-    #include "unicode.h"
+    #include "features/unicode.h"
 #endif
 
 #ifdef LAYER_NUMPAD

diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk
@@ -1,16 +1,16 @@
 SRC += konstantin.c
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-    SRC += rgb.c
+    SRC += features/rgb.c
 endif
 RGB_MATRIX_ENABLE ?= no
 ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
-    SRC += rgb.c
+    SRC += features/rgb.c
 endif
 ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-    SRC += tap_dance.c
+    SRC += features/tap_dance.c
 endif
 ifneq (,$(filter yes,$(UNICODE_ENABLE) $(UNICODEMAP_ENABLE)))
-    SRC += unicode.c
+    SRC += features/unicode.c
 endif
 
 ifneq ($(PLATFORM),CHIBIOS)