summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-04-17 14:16:03 -0500
committerIBNobody <ibnobody@gmail.com>2016-04-17 14:16:03 -0500
commit23231fa577f7c6c585124226a83f21a7668e62dd (patch)
tree949a355760e243909aa8a0637017a972e8862cf3 /quantum
parent3103ea542f0039637a1a266df79a97a7a13fa6b4 (diff)
Converted goodbye to notes, fixed eighth dotted note macro
Diffstat (limited to 'quantum')
-rw-r--r--quantum/audio.h1
-rw-r--r--quantum/keymap_common.c14
-rw-r--r--quantum/musical_notes.h2
-rw-r--r--quantum/song_list.h7
4 files changed, 14 insertions, 10 deletions
diff --git a/quantum/audio.h b/quantum/audio.h
index 3aba8370ac..05d314c940 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -3,6 +3,7 @@
#include <avr/io.h>
#include <util/delay.h>
#include "musical_notes.h"
+#include "song_list.h"
#ifndef AUDIO_H
#define AUDIO_H
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index c705b7a730..2001438b90 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -34,15 +34,13 @@ extern keymap_config_t keymap_config;
#include <inttypes.h>
#ifdef AUDIO_ENABLE
#include "audio.h"
+
#ifndef TONE_GOODBYE
- #define TONE_GOODBYE { \
- {440.0*pow(2.0,(31)/12.0), 8}, \
- {440.0*pow(2.0,(24)/12.0), 8}, \
- {440.0*pow(2.0,(19)/12.0), 12}, \
- }
- #endif
- float tone_goodbye[][2] = TONE_GOODBYE;
-#endif
+ #define TONE_GOODBYE OLKB_GOODBYE
+ #endif /*! TONE_GOODBYE */
+
+ float tone_goodbye[][2] = SONG(TONE_GOODBYE);
+#endif /* AUDIO_ENABLE */
static action_t keycode_to_action(uint16_t keycode);
diff --git a/quantum/musical_notes.h b/quantum/musical_notes.h
index 2170f3f18b..ccdc34f270 100644
--- a/quantum/musical_notes.h
+++ b/quantum/musical_notes.h
@@ -32,7 +32,7 @@
#define WD_NOTE(n) WHOLE_DOT_NOTE(n)
#define HD_NOTE(n) HALF_DOT_NOTE(n)
#define QD_NOTE(n) QUARTER_DOT_NOTE(n)
-#define ED_NOTE(n) EIGTH_DOT_NOTE(n)
+#define ED_NOTE(n) EIGHTH_DOT_NOTE(n)
#define SD_NOTE(n) SIXTEENTH_DOT_NOTE(n)
// Note Styles
diff --git a/quantum/song_list.h b/quantum/song_list.h
index ef36a1cddf..b626c3fa6b 100644
--- a/quantum/song_list.h
+++ b/quantum/song_list.h
@@ -15,4 +15,9 @@
QD_NOTE(_B4), E__NOTE(_D5), Q__NOTE(_G5), \
H__NOTE(_FS5),
-#endif \ No newline at end of file
+#define OLKB_GOODBYE \
+ E__NOTE(_E7), \
+ E__NOTE(_A6), \
+ ED_NOTE(_E6),
+
+#endif