diff options
author | Drashna Jaelre <[email protected]> | 2019-02-13 21:11:56 -0800 |
---|---|---|
committer | MechMerlin <[email protected]> | 2019-02-13 21:11:56 -0800 |
commit | 54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc (patch) | |
tree | 4f8b9b3434f54743031eab2c3fd0b7300739707c /users/drashna/config.h | |
parent | 9841c64de98a0d993e791137d5db482ee96e06ae (diff) | |
download | qmk_firmware-54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc.tar.gz qmk_firmware-54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc.zip |
[Keymap] Update to Drashna keymaps and Userspace (#5122)
* Proper rules include
* Minor tweaks
* Minor tweaks
* Add Desitny 2 Swapped layout support
* Add keycode to keylogger
* Convert my viterbi keymaps
* Fix Orthodox keyboard
* Add more default layers
* Make default layer keycodes more optimized
* Update gitlab CI yaml file
* Rev6 Cleanup
* Fix KC_MAKE macro
* Update GitLab CI yaml file
* More GitLab CI changes
* One final GitLab CI change
* Optimize KC_MAKE
* Reformatting of config
* Feature creeeeeeep
* Planck Rev6 updates
Diffstat (limited to 'users/drashna/config.h')
-rw-r--r-- | users/drashna/config.h | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index 827b1b8ace..20e58fd0bb 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -2,43 +2,50 @@ #ifdef AUDIO_ENABLE -#define AUDIO_CLICKY -#define STARTUP_SONG SONG(RICK_ROLL) -#define GOODBYE_SONG SONG(SONIC_RING) -#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND), \ - SONG(OVERWATCH_THEME) \ - } - -#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f -// #ifdef RGBLIGHT_ENABLE -// #define NO_MUSIC_MODE -// #endif //RGBLIGHT_ENABLE/ -#ifndef __arm__ -#undef NOTE_REST -#define NOTE_REST 1.00f -#endif // !__arm__ + #define AUDIO_CLICKY + #define STARTUP_SONG SONG(RICK_ROLL) + #define GOODBYE_SONG SONG(SONIC_RING) + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND), \ + SONG(OVERWATCH_THEME) \ + } + + #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f + // #ifdef RGBLIGHT_ENABLE + // #define NO_MUSIC_MODE + // #endif //RGBLIGHT_ENABLE/ + #ifndef __arm__ + #undef NOTE_REST + #define NOTE_REST 1.00f + #endif // !__arm__ + +#define UNICODE_SONG_OSX SONG(RICK_ROLL) +#define UNICODE_SONG_LNX SONG(RICK_ROLL) +#define UNICODE_SONG_WIN SONG(RICK_ROLL) +#define UNICODE_SONG_BSD SONG(RICK_ROLL) +#define UNICODE_SONG_WINC SONG(RICK_ROLL) + #endif // !AUDIO_ENABLE #ifdef RGBLIGHT_ENABLE -#define RGBLIGHT_SLEEP -#undef RGBLIGHT_ANIMATIONS -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT + #define RGBLIGHT_SLEEP + #undef RGBLIGHT_ANIMATIONS + #define RGBLIGHT_EFFECT_BREATHING + #define RGBLIGHT_EFFECT_SNAKE + #define RGBLIGHT_EFFECT_KNIGHT #endif // RGBLIGHT_ENABLE #ifndef ONESHOT_TAP_TOGGLE -#define ONESHOT_TAP_TOGGLE 2 + #define ONESHOT_TAP_TOGGLE 2 #endif // !ONESHOT_TAP_TOGGLE #ifndef ONESHOT_TIMEOUT -#define ONESHOT_TIMEOUT 3000 + #define ONESHOT_TIMEOUT 3000 #endif// !ONESHOT_TIMEOUT #ifndef QMK_KEYS_PER_SCAN -#define QMK_KEYS_PER_SCAN 4 + #define QMK_KEYS_PER_SCAN 4 #endif // !QMK_KEYS_PER_SCAN @@ -48,18 +55,18 @@ // and when this option isn't enabled, z rapidly followed by x // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT -#undef PERMISSIVE_HOLD +// #define PERMISSIVE_HOLD //#define TAPPING_FORCE_HOLD //#define RETRO_TAPPING #define FORCE_NKRO #ifndef TAPPING_TOGGLE -#define TAPPING_TOGGLE 1 + #define TAPPING_TOGGLE 1 #endif #ifdef TAPPING_TERM -#undef TAPPING_TERM + #undef TAPPING_TERM #endif // TAPPING_TERM #if defined(KEYBOARD_ergodox_ez) #define TAPPING_TERM 185 |