diff options
author | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
---|---|---|
committer | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
commit | 4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch) | |
tree | 612da1c6de929e6e0a5b0847d7b594cb3becdf27 /quantum/fauxclicky.h | |
parent | 8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff) | |
parent | aaa67f69305c5c78e15a1090ba7058adea59ff36 (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 |