diff options
| author | Adam Lee <adam@bigtuna.io> | 2017-05-07 14:36:10 -0700 |
|---|---|---|
| committer | Adam Lee <adam@bigtuna.io> | 2017-05-07 14:36:10 -0700 |
| commit | f2fcab96a8dd8cc70d6785da76621c48df1af94c (patch) | |
| tree | 9be0967ab0d3795e6d20299988c84280f3ad98f6 /quantum/fauxclicky.h | |
| parent | f90321bdcbcbd196ee642cdd8cc31aa0f6ac121e (diff) | |
| parent | 2704c163da590d3020f6d87717c400611de81110 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/fauxclicky.h')
| -rw-r--r-- | quantum/fauxclicky.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/quantum/fauxclicky.h b/quantum/fauxclicky.h index 109bd0d83e..1a8e188dd5 100644 --- a/quantum/fauxclicky.h +++ b/quantum/fauxclicky.h @@ -21,11 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "stdbool.h" __attribute__ ((weak)) -float fauxclicky_pressed_note[2]; +float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_D4, 0.25); __attribute__ ((weak)) -float fauxclicky_released_note[2]; +float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125); __attribute__ ((weak)) -float fauxclicky_beep_note[2]; +float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C4, 0.25); bool fauxclicky_enabled; @@ -73,11 +73,11 @@ bool fauxclicky_enabled; #endif #ifndef FAUXCLICKY_ENABLE_OUTPUT -#define FAUXCLICKY_ENABLE_OUTPUT TCCR3A |= _BV(COM3A1); +#define FAUXCLICKY_ENABLE_OUTPUT TCCR3A |= _BV(COM3A1) #endif #ifndef FAUXCLICKY_DISABLE_OUTPUT -#define FAUXCLICKY_DISABLE_OUTPUT TCCR3A &= ~(_BV(COM3A1) | _BV(COM3A0)); +#define FAUXCLICKY_DISABLE_OUTPUT TCCR3A &= ~(_BV(COM3A1) | _BV(COM3A0)) #endif #ifndef FAUXCLICKY_TIMER_PERIOD |