diff options
author | Josh <josh@visionistinc.com> | 2019-05-17 16:48:53 -0400 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-05-17 13:48:53 -0700 |
commit | d85110b6ec5fcdf3ef88b41909ce739b017abbea (patch) | |
tree | 4fd8ad2cd4d53362fe9cf1cd6da5fa51b808cc70 /quantum/process_keycode/process_clicky.c | |
parent | 00d1d7828c63538122d9d3db7336b9a40c9ffe80 (diff) | |
download | qmk_firmware-d85110b6ec5fcdf3ef88b41909ce739b017abbea.tar.gz qmk_firmware-d85110b6ec5fcdf3ef88b41909ce739b017abbea.zip |
Adds a configurable initial delay to the audio clicky feature (#4286)
* Adding an AUDIO_CLICKY_DELAY_DURATION configurable value to the AUDIO_CLICKY feature.
* Tweaking my community keymap to work better with my rev 4 planck.
Diffstat (limited to 'quantum/process_keycode/process_clicky.c')
-rw-r--r-- | quantum/process_keycode/process_clicky.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c index 12fef51f9..43b803afe 100644 --- a/quantum/process_keycode/process_clicky.c +++ b/quantum/process_keycode/process_clicky.c | |||
@@ -3,6 +3,9 @@ | |||
3 | 3 | ||
4 | #ifdef AUDIO_CLICKY | 4 | #ifdef AUDIO_CLICKY |
5 | 5 | ||
6 | #ifndef AUDIO_CLICKY_DELAY_DURATION | ||
7 | #define AUDIO_CLICKY_DELAY_DURATION 1 | ||
8 | #endif // !AUDIO_CLICKY_DELAY_DURATION | ||
6 | #ifndef AUDIO_CLICKY_FREQ_DEFAULT | 9 | #ifndef AUDIO_CLICKY_FREQ_DEFAULT |
7 | #define AUDIO_CLICKY_FREQ_DEFAULT 440.0f | 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 440.0f |
8 | #endif // !AUDIO_CLICKY_FREQ_DEFAULT | 11 | #endif // !AUDIO_CLICKY_FREQ_DEFAULT |
@@ -21,7 +24,9 @@ | |||
21 | 24 | ||
22 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; | 25 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; |
23 | float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS; | 26 | float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS; |
24 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations | 27 | |
28 | // the first "note" is an intentional delay; the 2nd and 3rd notes are the "clicky" | ||
29 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_MIN, AUDIO_CLICKY_DELAY_DURATION}, {AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations | ||
25 | 30 | ||
26 | extern audio_config_t audio_config; | 31 | extern audio_config_t audio_config; |
27 | 32 | ||
@@ -34,8 +39,8 @@ void clicky_play(void) { | |||
34 | #ifndef NO_MUSIC_MODE | 39 | #ifndef NO_MUSIC_MODE |
35 | if (music_activated || midi_activated || !audio_config.enable) return; | 40 | if (music_activated || midi_activated || !audio_config.enable) return; |
36 | #endif // !NO_MUSIC_MODE | 41 | #endif // !NO_MUSIC_MODE |
37 | clicky_song[0][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); | 42 | clicky_song[1][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); |
38 | clicky_song[1][0] = clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); | 43 | clicky_song[2][0] = clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); |
39 | PLAY_SONG(clicky_song); | 44 | PLAY_SONG(clicky_song); |
40 | } | 45 | } |
41 | 46 | ||