mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-08 23:05:43 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
5c4138793e
@ -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
|
||||
|
@ -1,5 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#define TAP_CODE_DELAY 10
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_SLEEP
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user