diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-08-29 10:42:15 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-08-29 13:42:15 -0400 |
| commit | e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf (patch) | |
| tree | 7bba9941bd9e1058d3105d2df312cb0006e56eba /users/drashna/config.h | |
| parent | 661ca4440cc42f3b60697e98985c44b0571ccfc1 (diff) | |
| download | qmk_firmware-e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf.tar.gz qmk_firmware-e4bbe057f2620ee24c3a78cb758cdfa7c4bd7abf.zip | |
Yet another update to drashna keymaps and userspace (#3787)
* Make tap function inline
* Use better makefile keyboard detection
* Remove Copy-Paste macro
* Add F11/F12 to Iris
* Minor tweaks to userspace config
* Set audio clicky randomness to 1.5
* Set NO_DEBUG to only be set if console is not enabled
* Move NO_MUSIC_MODE to userspace config.h
* Reduce Ergodox Debounce
* Add Planck Light config
* Use OSM for ortho 4x12
* Music Mode changes for planck light
* Cleanup do to shutdown user and other fixes in Master
* Add and use 'shutdown_user' fzunction
* Remove global NO_MUSIC_MODE define
* Add NO_MUSIC_MODE to individual keymaps
* Change layer colors
* Remove NO_PRINT and NO_DEBUG from userspace config.h
Since these are automatically disabled if the console isn't enabled.
* Remove backlight code if backlight isn't enabled
* Remove Twinkle from Ergodox
* Disable RGB twinkling and enable PSM
* Clean up RGB matrix code
* Clean up planck light indicators
* Clean up tap code
* Rules cleanup for ortho 4x12
* Fix up userspace template
* Revert "Clean up tap code"
This reverts commit 09f64d6d67aa021c3b5ac86a9a739a5ca2b9c1ec.
* Organize includes
* userspace cleanup
* Fix modifier spelling error
* Fix userspace rules
* Disable Permissive Hold again
* Minor clean up
* Fix Tap stuff
* Viterbi Updates for file size
Diffstat (limited to 'users/drashna/config.h')
| -rw-r--r-- | users/drashna/config.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index 87050fbcc..dd6875ceb 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h | |||
| @@ -11,8 +11,10 @@ | |||
| 11 | SONG(OVERWATCH_THEME) \ | 11 | SONG(OVERWATCH_THEME) \ |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f | 14 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f |
| 15 | 15 | // #ifdef RGBLIGHT_ENABLE | |
| 16 | // #define NO_MUSIC_MODE | ||
| 17 | // #endif //RGBLIGHT_ENABLE | ||
| 16 | #endif | 18 | #endif |
| 17 | 19 | ||
| 18 | #ifdef RGBLIGHT_ENABLE | 20 | #ifdef RGBLIGHT_ENABLE |
| @@ -40,8 +42,8 @@ | |||
| 40 | // and when this option isn't enabled, z rapidly followed by x | 42 | // and when this option isn't enabled, z rapidly followed by x |
| 41 | // actually sends Ctrl-x. That's bad.) | 43 | // actually sends Ctrl-x. That's bad.) |
| 42 | #define IGNORE_MOD_TAP_INTERRUPT | 44 | #define IGNORE_MOD_TAP_INTERRUPT |
| 43 | #undef PERMISSIVE_HOLD | 45 | #undef PERMISSIVE_HOLD |
| 44 | #undef PREVENT_STUCK_MODIFIERS | 46 | #define PREVENT_STUCK_MODIFIERS |
| 45 | // #define TAPPING_FORCE_HOLD | 47 | // #define TAPPING_FORCE_HOLD |
| 46 | //#define RETRO_TAPPING | 48 | //#define RETRO_TAPPING |
| 47 | 49 | ||
| @@ -59,12 +61,6 @@ | |||
| 59 | 61 | ||
| 60 | // Disable action_get_macro and fn_actions, since we don't use these | 62 | // Disable action_get_macro and fn_actions, since we don't use these |
| 61 | // and it saves on space in the firmware. | 63 | // and it saves on space in the firmware. |
| 62 | #ifndef NO_DEBUG | ||
| 63 | #define NO_DEBUG | ||
| 64 | #endif // !NO_DEBUG | ||
| 65 | #if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) | ||
| 66 | #define NO_PRINT | ||
| 67 | #endif // !NO_PRINT | ||
| 68 | #define NO_ACTION_MACRO | 64 | #define NO_ACTION_MACRO |
| 69 | #define NO_ACTION_FUNCTION | 65 | #define NO_ACTION_FUNCTION |
| 70 | 66 | ||