summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-04-10 11:52:26 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-04-13 16:00:29 +0300
commit08b9eb26c5a7b0d0b1921dc7b4785adb95b5953e (patch)
tree9ab714acabfd6a3c560f3b7405dfdc244a2f94a4
parent109ae2f1e889a2450a98da41f17956c8ce9b79da (diff)
Fix warnings in CMD-Preonic
The startup_sound is defined using MUSICAL_NOTEs, since non-constant initializer expressions are not allowed in C.
-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 5d217e2615..a500a36494 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);