diff options
| author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2020-02-03 13:37:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 22:37:01 +0100 |
| commit | c6f389b527e04e11e62a11e329f8f52b67a47d63 (patch) | |
| tree | 0ad7610f19ae8b00b8d5349ca04091df5e512fd5 /users/mechmerlin/config.h | |
| parent | 5780c94423615ba51343cd88ae55cf5fdaffb6df (diff) | |
| download | qmk_firmware-c6f389b527e04e11e62a11e329f8f52b67a47d63.tar.gz qmk_firmware-c6f389b527e04e11e62a11e329f8f52b67a47d63.zip | |
Merlin's userspace updates (#8074)
Diffstat (limited to 'users/mechmerlin/config.h')
| -rw-r--r-- | users/mechmerlin/config.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h index fe8f9c9ff..698e237b0 100644 --- a/users/mechmerlin/config.h +++ b/users/mechmerlin/config.h | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f | 10 | #define AUDIO_CLICKY_FREQ_DEFAULT 261.63f |
| 11 | #define AUDIO_CLICKY_FREQ_MIN 65.41f | 11 | #define AUDIO_CLICKY_FREQ_MIN 65.41f |
| 12 | #define AUDIO_CLICKY_FREQ_MAX 1046.5f | 12 | #define AUDIO_CLICKY_FREQ_MAX 1046.5f |
| 13 | //#define AUDIO_CLICKY_FREQ_FACTOR 1.18921f | ||
| 14 | //#define AUDIO_CLICKY_FREQ_FACTOR 2.71828f // e | ||
| 15 | #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio | 13 | #define AUDIO_CLICKY_FREQ_FACTOR 1.61803f // golden ratio |
| 16 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f | 14 | #define AUDIO_CLICKY_FREQ_RANDOMNESS 17.0f |
| 17 | #endif | 15 | #endif |
| @@ -24,7 +22,7 @@ | |||
| 24 | #ifndef AUDIO_CLICKY | 22 | #ifndef AUDIO_CLICKY |
| 25 | #define AUDIO_CLICKY | 23 | #define AUDIO_CLICKY |
| 26 | #endif | 24 | #endif |
| 27 | #elif defined(KEYBOARD_clueboard_66_hotswap_gen1) | 25 | #elif defined(KEYBOARD_clueboard_66_hotswap_gen1) || defined(KEYBOARD_clueboard_66_rev4) |
| 28 | #ifndef AUDIO_CLICKY | 26 | #ifndef AUDIO_CLICKY |
| 29 | #define AUDIO_CLICKY | 27 | #define AUDIO_CLICKY |
| 30 | #endif | 28 | #endif |