Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

userspace/community layout fixes #19998

Merged
merged 4 commits into from
Mar 15, 2023
Merged

userspace/community layout fixes #19998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15a3201
fixup: improve AVR detection for 60_iso/unxmaal
lesshonor Mar 2, 2023
7f0c031
fixup: moved TAP_CODE_DELAY to mechmerlin/config.h
lesshonor Mar 2, 2023
0a997f4
fixup: move talljoe.c to INTROSPECTION_KEYMAP_C
lesshonor Mar 2, 2023
37c12ae
fixup: AVR/RGBLIGHT criteria for 60_iso/unxmaal
lesshonor Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions layouts/community/60_iso/unxmaal/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions users/mechmerlin/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#define TAP_CODE_DELAY 10

#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SLEEP
#define RGBLIGHT_EFFECT_BREATHING
Expand Down
4 changes: 1 addition & 3 deletions users/mechmerlin/mechmerlin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -26,4 +24,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;
}
return true;
}
}
4 changes: 3 additions & 1 deletion users/talljoe/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down