diff options
author | Drashna Jaelre <drashna@live.com> | 2018-09-27 18:12:32 -0700 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-27 18:31:18 -0700 |
commit | edeace279b1cdc5a5450cc5b41d49b341a3a121f (patch) | |
tree | e86343dd2b7a68203c800cca691b0f1c6b20ceeb /quantum/process_keycode | |
parent | 246d539f295c70846aa4ecaf9cfbe79b959bf3c7 (diff) | |
download | qmk_firmware-edeace279b1cdc5a5450cc5b41d49b341a3a121f.tar.gz qmk_firmware-edeace279b1cdc5a5450cc5b41d49b341a3a121f.zip |
Make Audio Clicky's randomness a float
Rather than a define, but read from the define. This way, a smart coder could externally configure the randomness, changing it on the fly
This is also a precursor step to adding full on support for configurable randomness.
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r-- | quantum/process_keycode/process_clicky.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c index 36578047a..8238c263f 100644 --- a/quantum/process_keycode/process_clicky.c +++ b/quantum/process_keycode/process_clicky.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #endif // !AUDIO_CLICKY_FREQ_RANDOMNESS | 20 | #endif // !AUDIO_CLICKY_FREQ_RANDOMNESS |
21 | 21 | ||
22 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; | 22 | float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; |
23 | float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS; | ||
23 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations | 24 | float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations |
24 | 25 | ||
25 | extern audio_config_t audio_config; | 26 | extern audio_config_t audio_config; |
@@ -33,8 +34,8 @@ void clicky_play(void) { | |||
33 | #ifndef NO_MUSIC_MODE | 34 | #ifndef NO_MUSIC_MODE |
34 | if (music_activated || midi_activated) return; | 35 | if (music_activated || midi_activated) return; |
35 | #endif // !NO_MUSIC_MODE | 36 | #endif // !NO_MUSIC_MODE |
36 | clicky_song[0][0] = 2.0f * clicky_freq * (1.0f + AUDIO_CLICKY_FREQ_RANDOMNESS * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); | 37 | clicky_song[0][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); |
37 | clicky_song[1][0] = clicky_freq * (1.0f + AUDIO_CLICKY_FREQ_RANDOMNESS * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); | 38 | clicky_song[1][0] = clicky_freq * (1.0f + clicky_rand * ( ((float)rand()) / ((float)(RAND_MAX)) ) ); |
38 | PLAY_SONG(clicky_song); | 39 | PLAY_SONG(clicky_song); |
39 | } | 40 | } |
40 | 41 | ||