summaryrefslogtreecommitdiff
path: root/keyboards/preonic
diff options
context:
space:
mode:
authorjpetermans2017-05-08 15:24:50 -0700
committerjpetermans2017-05-08 15:24:50 -0700
commit967cf0f6d43bd05c9951c7c31190971acd0799ea (patch)
tree34ff786a7e5177c6edc48e93b69ce71132cb3cbf /keyboards/preonic
parent5df74f3ba73f18f6bbd13b82a3a960c86fa592e1 (diff)
parent153eb95ab208cf5563ce2fae7ec68981b64d11ce (diff)
Merge remote-tracking branch 'upstream/master' into user_led_configuration
Diffstat (limited to 'keyboards/preonic')
-rw-r--r--keyboards/preonic/keymaps/CMD-Preonic/keymap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
index 5d217e261..a500a3649 100644
--- a/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
+++ b/keyboards/preonic/keymaps/CMD-Preonic/keymap.c
@@ -212,10 +212,10 @@ const uint16_t PROGMEM fn_actions[] = {
#ifdef AUDIO_ENABLE
float start_up[][2] = {
- {440.0*pow(2.0,(14)/12.0), 20},
- {440.0*pow(2.0,(26)/12.0), 8},
- {440.0*pow(2.0,(18)/12.0), 20},
- {440.0*pow(2.0,(26)/12.0), 8}
+ MUSICAL_NOTE(_B5, 20),
+ MUSICAL_NOTE(_B6, 8),
+ MUSICAL_NOTE(_DS6, 20),
+ MUSICAL_NOTE(_B6, 8),
};
float tone_qwerty[][2] = SONG(QWERTY_SOUND);
@@ -323,7 +323,7 @@ void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
-void play_goodbye_tone()
+void play_goodbye_tone(void)
{
PLAY_NOTE_ARRAY(goodbye, false, 0);
_delay_ms(150);