userspace/community layout fixes (#19998)

* fixup: improve AVR detection for 60_iso/unxmaal * fixup: moved TAP_CODE_DELAY to mechmerlin/config.h * fixup: move talljoe.c to INTROSPECTION_KEYMAP_C * fixup: AVR/RGBLIGHT criteria for 60_iso/unxmaal
qmk · Mar 15, 2023 · 70bf714 · 70bf714
1 parent 291834b
commit 70bf714
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,4 +1,7 @@
-# Only enable RGB on avr boards
-ifndef MCU_FAMILY
-    RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+# Only enable RGBLIGHT on avr boards
+ifeq ($(strip $(PLATFORM_KEY)),avr)
+    # ...that are at least prepared for it
+    ifdef RGBLIGHT_DRIVER
+        RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
+    endif
 endif
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define TAP_CODE_DELAY 10
+
 #ifdef RGBLIGHT_ENABLE
     #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING

diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c
@@ -1,8 +1,6 @@
 #include "mechmerlin.h"
 #include "version.h"
 
-#define TAP_CODE_DELAY 10
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     static uint16_t fnx_layer_timer;
 
@@ -26,4 +24,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     }
     return true;
-}
+}
diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk
@@ -1,4 +1,6 @@
-SRC += talljoe.c macros.c $(wildcard users/talljoe/tapdance/*.c)
+INTROSPECTION_KEYMAP_C = talljoe.c
+
+SRC += macros.c $(wildcard users/talljoe/tapdance/*.c)
 ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
   SRC += visualizer.c
 endif