From 70bf714cdba57793efe537208620e7eb30d3b15f Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:47:12 -0400 Subject: 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 --- layouts/community/60_iso/unxmaal/rules.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'layouts/community/60_iso') diff --git a/layouts/community/60_iso/unxmaal/rules.mk b/layouts/community/60_iso/unxmaal/rules.mk index 2ce7257d2b..c2d3c6b075 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 -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 -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- layouts/community/60_iso/unxmaal/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'layouts/community/60_iso') diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h index 026f20dc8f..63d02fc807 100644 --- a/layouts/community/60_iso/unxmaal/config.h +++ b/layouts/community/60_iso/unxmaal/config.h @@ -17,8 +17,7 @@ along with this program. If not, see . #pragma once -#ifndef RGB_DI_PIN - #define RGB_DI_PIN F4 +#define RGB_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -33,4 +32,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- layouts/community/60_iso/unxmaal/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layouts/community/60_iso') diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h index 63d02fc807..4606bc8a6d 100644 --- a/layouts/community/60_iso/unxmaal/config.h +++ b/layouts/community/60_iso/unxmaal/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL -- cgit v1.2.3