diff options
| author | zvecr <git@zvecr.com> | 2022-02-25 23:45:40 +0000 | 
|---|---|---|
| committer | zvecr <git@zvecr.com> | 2022-02-25 23:45:40 +0000 | 
| commit | e7931289918221081cbe2a7ea5df27a5d86324db (patch) | |
| tree | 0b06145520f8aaf5ff5cb928aa5176fc2dd23619 /quantum/process_keycode/process_clicky.c | |
| parent | c0ee3d2c79388187883b1b1b1d1a0b6842acf741 (diff) | |
| parent | cf31355f08dca311a013168eb3eb995e2fc6a3d1 (diff) | |
Merge remote-tracking branch 'origin/develop'
Diffstat (limited to 'quantum/process_keycode/process_clicky.c')
| -rw-r--r-- | quantum/process_keycode/process_clicky.c | 32 | 
1 files changed, 18 insertions, 14 deletions
| diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c index 6ab382d4aa..9795734984 100644 --- a/quantum/process_keycode/process_clicky.c +++ b/quantum/process_keycode/process_clicky.c @@ -5,40 +5,40 @@  #    ifndef AUDIO_CLICKY_DELAY_DURATION  #        define AUDIO_CLICKY_DELAY_DURATION 1 -#    endif  // !AUDIO_CLICKY_DELAY_DURATION +#    endif // !AUDIO_CLICKY_DELAY_DURATION  #    ifndef AUDIO_CLICKY_FREQ_DEFAULT  #        define AUDIO_CLICKY_FREQ_DEFAULT 440.0f -#    endif  // !AUDIO_CLICKY_FREQ_DEFAULT +#    endif // !AUDIO_CLICKY_FREQ_DEFAULT  #    ifndef AUDIO_CLICKY_FREQ_MIN  #        define AUDIO_CLICKY_FREQ_MIN 65.0f -#    endif  // !AUDIO_CLICKY_FREQ_MIN +#    endif // !AUDIO_CLICKY_FREQ_MIN  #    ifndef AUDIO_CLICKY_FREQ_MAX  #        define AUDIO_CLICKY_FREQ_MAX 1500.0f -#    endif  // !AUDIO_CLICKY_FREQ_MAX +#    endif // !AUDIO_CLICKY_FREQ_MAX  #    ifndef AUDIO_CLICKY_FREQ_FACTOR  #        define AUDIO_CLICKY_FREQ_FACTOR 1.18921f -#    endif  // !AUDIO_CLICKY_FREQ_FACTOR +#    endif // !AUDIO_CLICKY_FREQ_FACTOR  #    ifndef AUDIO_CLICKY_FREQ_RANDOMNESS  #        define AUDIO_CLICKY_FREQ_RANDOMNESS 0.05f -#    endif  // !AUDIO_CLICKY_FREQ_RANDOMNESS +#    endif // !AUDIO_CLICKY_FREQ_RANDOMNESS  float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;  float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS;  // the first "note" is an intentional delay; the 2nd and 3rd notes are the "clicky" -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 +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  extern audio_config_t audio_config;  #    ifndef NO_MUSIC_MODE  extern bool music_activated;  extern bool midi_activated; -#    endif  // !NO_MUSIC_MODE +#    endif // !NO_MUSIC_MODE  void clicky_play(void) {  #    ifndef NO_MUSIC_MODE      if (music_activated || midi_activated || !audio_config.enable) return; -#    endif  // !NO_MUSIC_MODE +#    endif // !NO_MUSIC_MODE      clicky_song[1][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));      clicky_song[2][0] = clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));      PLAY_SONG(clicky_song); @@ -58,7 +58,9 @@ void clicky_freq_down(void) {      }  } -void clicky_freq_reset(void) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; } +void clicky_freq_reset(void) { +    clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; +}  void clicky_toggle(void) {      audio_config.clicky_enable ^= 1; @@ -75,7 +77,9 @@ void clicky_off(void) {      eeconfig_update_audio(audio_config.raw);  } -bool is_clicky_on(void) { return (audio_config.clicky_enable != 0); } +bool is_clicky_on(void) { +    return (audio_config.clicky_enable != 0); +}  bool process_clicky(uint16_t keycode, keyrecord_t *record) {      if (keycode == CLICKY_TOGGLE && record->event.pressed) { @@ -101,8 +105,8 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {      }      if (audio_config.enable && audio_config.clicky_enable) { -        if (record->event.pressed) {                       // Leave this separate so it's easier to add upstroke sound -            if (keycode != AU_OFF && keycode != AU_TOG) {  // DO NOT PLAY if audio will be disabled, and causes issuse on ARM +        if (record->event.pressed) {                      // Leave this separate so it's easier to add upstroke sound +            if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM                  clicky_play();              }          } @@ -110,4 +114,4 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {      return true;  } -#endif  // AUDIO_CLICKY +#endif // AUDIO_CLICKY | 
