diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-17 21:15:50 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-17 21:15:50 -0400 |
| commit | 5a15c113d7458bf3bea6904e3c607898e961164c (patch) | |
| tree | e96a0a45c77767d6aba452a7f82791bd104ac991 /quantum/audio.c | |
| parent | d94960be5b32b6a4019b822550ae09cf802bfcd7 (diff) | |
| parent | 5c98ad59606ee95b82c27bf2525383a9ec88542b (diff) | |
Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware
Diffstat (limited to 'quantum/audio.c')
| -rw-r--r-- | quantum/audio.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/quantum/audio.c b/quantum/audio.c index e0413051a0..5805da46c1 100644 --- a/quantum/audio.c +++ b/quantum/audio.c @@ -351,7 +351,7 @@ void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest) if (audio_config.enable) { - if (note) + if (note || notes) stop_all_notes(); notes = true; @@ -406,7 +406,7 @@ void play_note(double freq, int vol) { if (audio_config.enable && voices < 8) { - if (notes) + if (note || notes) stop_all_notes(); note = true; #ifdef PWM_AUDIO @@ -471,3 +471,16 @@ void increase_tempo(uint8_t tempo_change) } } +//------------------------------------------------------------------------------ +// Override these functions in your keymap file to play different tunes on +// startup and bootloader jump +__attribute__ ((weak)) +void play_startup_tone() +{ +} + +__attribute__ ((weak)) +void play_goodbye_tone() +{ +} +//------------------------------------------------------------------------------ |