diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-29 15:03:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 15:03:52 +0200 |
| commit | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch) | |
| tree | cccdc512fed02293ffd0bfb962ec14d8a8664e7f /quantum/fauxclicky.h | |
| parent | 215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff) | |
| parent | 26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff) | |
| download | firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.tar.gz firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.tar.bz2 firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.zip | |
Merge pull request #21 from qmk/master
Merge from QMK
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 109bd0d83..1a8e188dd 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 |