summaryrefslogtreecommitdiffstats
path: root/quantum/fauxclicky.h
diff options
context:
space:
mode:
authorAdam Lee <adam@bigtuna.io>2017-05-07 23:35:43 +0200
committerAdam Lee <adam@bigtuna.io>2017-05-07 23:35:43 +0200
commit29df2be2a96d5d4d33a8835cf8ec4760098cdaf1 (patch)
treed6dd7f5254188e55f4663dab5a61ca58ad7142cd /quantum/fauxclicky.h
parent425e7348d8b6fa40dd7aa3f4c99dbbff6f5babd8 (diff)
parent2704c163da590d3020f6d87717c400611de81110 (diff)
downloadqmk_firmware-29df2be2a96d5d4d33a8835cf8ec4760098cdaf1.tar.gz
qmk_firmware-29df2be2a96d5d4d33a8835cf8ec4760098cdaf1.tar.xz
Merge remote-tracking branch 'upstream/master' into dev
Diffstat (limited to 'quantum/fauxclicky.h')
-rw-r--r--quantum/fauxclicky.h10
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