diff options
| author | Less/Rikki <86894501+lesshonor@users.noreply.github.com> | 2023-03-15 11:47:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 15:47:12 +0000 |
| commit | 70bf714cdba57793efe537208620e7eb30d3b15f (patch) | |
| tree | 895c9cb3b35b615d5f3be6e92ef07f36f2d0a3f7 | |
| parent | 291834b162f070fb76d2f50d360b9943b919cd61 (diff) | |
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
| -rw-r--r-- | layouts/community/60_iso/unxmaal/rules.mk | 9 | ||||
| -rw-r--r-- | users/mechmerlin/config.h | 2 | ||||
| -rw-r--r-- | users/mechmerlin/mechmerlin.c | 4 | ||||
| -rw-r--r-- | users/talljoe/rules.mk | 4 |
4 files changed, 12 insertions, 7 deletions
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 diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h index ec3b3e81e8..e5f0f397d4 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 23def968d4..5c8ecb9007 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 +} diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk index 9338568b97..957ce2a71a 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 |