diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2018-06-12 10:59:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-06-12 10:59:35 -0400 |
| commit | 998ddbb122c9d3e2a77bd4e88c881b225ca0d569 (patch) | |
| tree | ca91ff7ad3c4866555d1e623fe9ea05276397e1c /users/drashna/config.h | |
| parent | c0095710a7c7e9bd94aa9f4dd814dc28d718c731 (diff) | |
| parent | 06487daaddf923d635e8a528d1eb644b875a73f6 (diff) | |
| download | firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.gz firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.bz2 firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.zip | |
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
Diffstat (limited to 'users/drashna/config.h')
| -rw-r--r-- | users/drashna/config.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index 0a59ad026..26c989d7f 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -4,7 +4,6 @@ #ifdef AUDIO_ENABLE #define AUDIO_CLICKY -#define AUDIO_CLICKY_ON #define STARTUP_SONG SONG(E1M1_DOOM) #define GOODBYE_SONG SONG(SONIC_RING) #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ @@ -12,12 +11,13 @@ SONG(DVORAK_SOUND), \ SONG(OVERWATCH_THEME) \ } + +#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f + #endif #ifdef RGBLIGHT_ENABLE - #ifndef KEYBOARD_ergodox_ez - #define RGBLIGHT_SLEEP - #endif // !KEYBOARD_ergodox_ez +#define RGBLIGHT_SLEEP #endif // RGBLIGHT_ENABLE @@ -43,6 +43,8 @@ #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #undef PREVENT_STUCK_MODIFIERS +// #define TAPPING_FORCE_HOLD +//#define RETRO_TAPPING #define FORCE_NKRO @@ -53,7 +55,7 @@ #ifdef TAPPING_TERM #undef TAPPING_TERM #endif // TAPPING_TERM -#define TAPPING_TERM 176 +#define TAPPING_TERM 175 // Disable action_get_macro and fn_actions, since we don't use these @@ -61,7 +63,7 @@ #ifndef NO_DEBUG #define NO_DEBUG #endif // !NO_DEBUG -#ifndef NO_PRINT +#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) #define NO_PRINT #endif // !NO_PRINT #define NO_ACTION_MACRO |