diff options
| author | IBNobody <ibnobody@gmail.com> | 2016-04-18 06:16:36 +0200 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-04-18 06:16:36 +0200 |
| commit | 82ec81660e9816b72bc0d661becc399c62594970 (patch) | |
| tree | 7926f955678faaf44120566ad47dfbcfa8144b3c /keyboard | |
| parent | ef73ab662812232f5e73c8098a059439dcb201fa (diff) | |
| parent | d94960be5b32b6a4019b822550ae09cf802bfcd7 (diff) | |
| download | qmk_firmware-82ec81660e9816b72bc0d661becc399c62594970.tar.gz qmk_firmware-82ec81660e9816b72bc0d661becc399c62594970.tar.xz | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/preonic/keymaps/default/keymap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c index 48bc72dab..2591af9f0 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 } |