Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-05-13 03:44:36 +00:00
commit a897c44132
2 changed files with 3 additions and 1 deletions

View file

@ -9,6 +9,7 @@
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#define BACKLIGHT_BREATHING #define BACKLIGHT_BREATHING
#define DYNAMIC_MACRO_NO_NESTING #define DYNAMIC_MACRO_NO_NESTING
#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
#define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0 #define MOUSEKEY_DELAY 0

View file

@ -9,7 +9,8 @@ SPACE_CADET_ENABLE = no
LEADER_ENABLE = no LEADER_ENABLE = no
DYNAMIC_MACRO_ENABLE = yes DYNAMIC_MACRO_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
CAPS_WORD_ENABLE = yes
ifeq ($(strip $(KEYBOARD)), planck/rev3) ifeq ($(strip $(KEYBOARD)), planck/rev3)
AUDIO_ENABLE = no AUDIO_ENABLE = no