diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-03-31 19:38:06 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-31 22:38:06 -0400 |
| commit | 61a2169ff9dea52136139ec156995efdc7929851 (patch) | |
| tree | 5aebd210218859e55b211f10684ef15fc23f9dcc /users/drashna/config.h | |
| parent | adae37f19f0d16b703e1ebce0449822492098444 (diff) | |
| download | qmk_firmware-61a2169ff9dea52136139ec156995efdc7929851.tar.gz qmk_firmware-61a2169ff9dea52136139ec156995efdc7929851.zip | |
Update to Drashna Keymaps and Userspace (#2650)
* Change global config.h settings
* Make Shift LED brighter
* Compatibility Tweaks
* Update ASCII art and layer comments
* Add comments about MOD layer
* Change ASCII art for reset, since it was out of date
* Use Overwatch theme for Workman layer
* Fix RGB define comments
* Make sure RGB set list matches
* Stop all notes for custom Faux Click
* Switch to OSM for everything, and remove RGB Sleep
* Never use KEYMAP now
* Only enable RGB Sleep on Non-Ergodox boards
* Cleanup do to new rgblight_list.h file
* Add redirect message for RGB codes
* Update userspace documentation
* Cleanup of Userspace
Add unicode support, and cleaned up comments for ifdef statements
* Remove unneeded slashes
* Unicode handling
* Force NKRO
Diffstat (limited to 'users/drashna/config.h')
| -rw-r--r-- | users/drashna/config.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index f33721d23..68394ee4d 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h | |||
| @@ -3,17 +3,19 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #ifdef AUDIO_ENABLE | 5 | #ifdef AUDIO_ENABLE |
| 6 | #define STARTUP_SONG SONG(IMPERIAL_MARCH) | 6 | #define STARTUP_SONG SONG(E1M1_DOOM) |
| 7 | #define GOODBYE_SONG SONG(SONIC_RING) | 7 | #define GOODBYE_SONG SONG(SONIC_RING) |
| 8 | #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ | 8 | #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ |
| 9 | SONG(COLEMAK_SOUND), \ | 9 | SONG(COLEMAK_SOUND), \ |
| 10 | SONG(DVORAK_SOUND), \ | 10 | SONG(DVORAK_SOUND), \ |
| 11 | SONG(PLOVER_SOUND) \ | 11 | SONG(OVERWATCH_THEME) \ |
| 12 | } | 12 | } |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | #ifdef RGBLIGHT_ENABLE | 15 | #ifdef RGBLIGHT_ENABLE |
| 16 | #define RGBLIGHT_SLEEP | 16 | #ifndef KEYBOARD_ergodox_ez |
| 17 | #define RGBLIGHT_SLEEP | ||
| 18 | #endif | ||
| 17 | #endif // RGBLIGHT_ENABLE | 19 | #endif // RGBLIGHT_ENABLE |
| 18 | 20 | ||
| 19 | 21 | ||
| @@ -40,6 +42,8 @@ | |||
| 40 | #undef PERMISSIVE_HOLD | 42 | #undef PERMISSIVE_HOLD |
| 41 | #undef PREVENT_STUCK_MODIFIERS | 43 | #undef PREVENT_STUCK_MODIFIERS |
| 42 | 44 | ||
| 45 | #define FORCE_NKRO | ||
| 46 | |||
| 43 | #ifndef TAPPING_TOGGLE | 47 | #ifndef TAPPING_TOGGLE |
| 44 | #define TAPPING_TOGGLE 1 | 48 | #define TAPPING_TOGGLE 1 |
| 45 | #endif | 49 | #endif |
| @@ -47,7 +51,7 @@ | |||
| 47 | #ifdef TAPPING_TERM | 51 | #ifdef TAPPING_TERM |
| 48 | #undef TAPPING_TERM | 52 | #undef TAPPING_TERM |
| 49 | #endif | 53 | #endif |
| 50 | #define TAPPING_TERM 150 | 54 | #define TAPPING_TERM 160 |
| 51 | 55 | ||
| 52 | 56 | ||
| 53 | // Disable action_get_macro and fn_actions, since we don't use these | 57 | // Disable action_get_macro and fn_actions, since we don't use these |
