From 051401175d98e777a6633445a0275b54ed36e97a Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 28 Feb 2023 11:14:48 -0800 Subject: [Keymap] Drashna updates for 0.20.0 (#19960) --- users/drashna/config.h | 44 +++++++++----------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) (limited to 'users/drashna/config.h') diff --git a/users/drashna/config.h b/users/drashna/config.h index 9edbfff56b..465ea63ee2 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -11,7 +11,6 @@ #endif #define IS_COMMAND() (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) - #if defined(SPLIT_KEYBOARD) # include "split/split_config.h" #endif @@ -27,51 +26,26 @@ # include "oled/oled_config.h" #endif +#ifdef POINTING_DEVICE_ENABLE +# include "pointing/pointing_config.h" +#endif // POINTING_DEVICE_ENABLE + +#ifdef AUDIO_ENABLE +# include "audio_config.h" +#endif // AUDIO_ENABLE + #if defined(WPM_ENABLE) // # define WPM_LAUNCH_CONTROL -// # define WPM_ALLOW_COUNT_REGRESSOIN // # define WPM_UNFILTERED +# define WPM_ALLOW_COUNT_REGRESSION # define WPM_SAMPLE_SECONDS 10 # define WPM_SAMPLE_PERIODS 50 # define WPM_ESTIMATED_WORD_SIZE 5 #endif -#ifdef AUDIO_ENABLE -# define AUDIO_CLICKY -# define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f - -# ifdef USER_SONG_LIST -# 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 UNICODE_SONG_MAC SONG(MARIO_THEME) -# define UNICODE_SONG_LNX SONG(MARIO_POWERUP) -# define UNICODE_SONG_WIN SONG(MARIO_ONEUP) -# define UNICODE_SONG_BSD SONG(RICK_ROLL) -# define UNICODE_SONG_WINC SONG(RICK_ROLL) -# else -# define STARTUP_SONG SONG(STARTUP_SOUND) -# define GOODBYE_SONG SONG(GOODBYE_SOUND) -# define DEFAULT_LAYER_SONGS \ - { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(WORKMAN_SOUND) } -# define UNICODE_SONG_MAC SONG(QWERTY_SOUND) -# define UNICODE_SONG_LNX SONG(COLEMAK_SOUND) -# define UNICODE_SONG_WIN SONG(DVORAK_SOUND) -# define UNICODE_SONG_BSD SONG(WORKMAN_SOUND) -# define UNICODE_SONG_WINC SONG(PLOVER_GOODBYE_SOUND) -# endif -#endif // !AUDIO_ENABLE #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS -// #define WPM_ESTIMATED_WORD_SIZE 5 -#define WPM_ALLOW_COUNT_REGRESSION -// #define WPM_UNFILTERED -// #define WPM_SAMPLE_SECONDS 5 -// #define WPM_SAMPLE_PERIODS 50 -// #define WPM_LAUNCH_CONTROL - #ifndef ONESHOT_TAP_TOGGLE # define ONESHOT_TAP_TOGGLE 2 #endif // !ONESHOT_TAP_TOGGLE -- cgit v1.2.3