From 15a3201ca12c0c37577a2a3fb6672141145f62fc Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:42:05 -0500
Subject: [PATCH 1/4] fixup: improve AVR detection for 60_iso/unxmaal

---
 layouts/community/60_iso/unxmaal/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index 2ce7257d2b80..512898b5ef66 100644
--- a/layouts/community/60_iso/unxmaal/rules.mk
+++ b/layouts/community/60_iso/unxmaal/rules.mk
@@ -1,4 +1,4 @@
 # Only enable RGB on avr boards
-ifndef MCU_FAMILY
+ifeq ($(strip $(PLATFORM)), AVR)
     RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
 endif

From 7f0c031ef58e3a7bd3bb00dd4cc98cc2b00e15d1 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:44:37 -0500
Subject: [PATCH 2/4] fixup: moved TAP_CODE_DELAY to mechmerlin/config.h

---
 users/mechmerlin/config.h     | 2 ++
 users/mechmerlin/mechmerlin.c | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index ec3b3e81e889..e5f0f397d474 100644
--- 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
index 23def968d449..5c8ecb9007be 100644
--- 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;
-}
\ No newline at end of file
+}

From 0a997f45b53e7def37770c49b4cfcd5a46c4549c Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:45:04 -0500
Subject: [PATCH 3/4] fixup: move talljoe.c to INTROSPECTION_KEYMAP_C

---
 users/talljoe/rules.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk
index 9338568b97b5..957ce2a71af8 100644
--- 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

From 37c12ae3b80861506b81c3365db4b79b0ea0649b Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Thu, 2 Mar 2023 20:05:05 -0500
Subject: [PATCH 4/4] fixup: AVR/RGBLIGHT criteria for 60_iso/unxmaal

---
 layouts/community/60_iso/unxmaal/rules.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk
index 512898b5ef66..c2d3c6b07589 100644
--- 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
-ifeq ($(strip $(PLATFORM)), AVR)
-    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