summaryrefslogtreecommitdiff
path: root/keyboard/preonic
diff options
context:
space:
mode:
authorStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-18 08:03:22 +0200
committerStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-18 08:03:22 +0200
commit9cc39156f7ac696c4561a8fa4e01bbcc9addc53e (patch)
treeaf166a966b16bb1714551265965b3660fa0c26ba /keyboard/preonic
parent6732d6cf1a3268ece981c6b0c07a1b9e0f61adbe (diff)
parentd94960be5b32b6a4019b822550ae09cf802bfcd7 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/preonic')
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 48bc72dab7..2591af9f02 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -224,6 +224,7 @@ float tone_music[][2] = {
{440.0*pow(2.0,(23)/12.0), 8},
{440.0*pow(2.0,(24)/12.0), 8}
};
+float ode_to_joy[][2] = SONG(ODE_TO_JOY);
#endif
void persistant_default_layer_set(uint16_t default_layer) {
@@ -312,7 +313,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 9:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- PLAY_NOTE_ARRAY(tone_music, false, 0);
+ init_notes();
+ set_tempo(150);
+ PLAY_NOTE_ARRAY(ode_to_joy, false, .25);
layer_on(_MUSIC);
#endif
}
@@ -339,6 +342,6 @@ void process_action_user(keyrecord_t *record) {
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
init_notes();
- play_notes(&start_up, false, 0);
+ PLAY_NOTE_ARRAY(start_up, false, 0);
#endif
}