diff options
author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
---|---|---|
committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
commit | 4279b14adffe081a3dfb17fa0f04ed21513e5eda (patch) | |
tree | 770bd82b05595b686ad8cfdce79ea7f8439bda83 /keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk | |
parent | 9d1c98c891bb8e1e98dc618e0693a7efff23a22e (diff) | |
parent | f4f679779e1404d9dc34c64823b9eb993bfa7ab3 (diff) | |
download | qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.tar.gz qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.zip |
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
keyboards/space_space/rules.mk
Diffstat (limited to 'keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk')
-rw-r--r-- | keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk index d2ed00e02d..6d3574e7f5 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk @@ -2,3 +2,8 @@ VIA_ENABLE = yes MOUSEKEY_ENABLE = no TAP_DANCE_ENABLE = yes BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite + +TD_LSFT_CAPSLOCK_ENABLE = yes +IDLE_TIMEOUT_ENABLE = yes +STARTUP_NUMLOCK_ON = yes +ENCODER_DEFAULTACTIONS_ENABLE = yes |