summaryrefslogtreecommitdiff
path: root/quantum/audio
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-24 11:56:53 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-24 11:56:53 -0400
commit287eb7ad148abc8fe3fb014218d71e205fd9131d (patch)
tree59e800a739797cb86d9345d01f73fceee4c32030 /quantum/audio
parent1ae6011cef2230826a9e6db6c5b638677bc640b7 (diff)
Converted audio play functions to *_user (#349)
* Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * Added music and audio toggles to Quantum.c * Redid the audio callbacks * Adjusted default planck layout to use the user tone naming * tabs to spaces * Rewrote the ALL recipe to allow for faster parallel make * tabs to spaces * Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around. * Tweaked pvc atomic layout to work with the pvc planck. * updates midi scale calling
Diffstat (limited to 'quantum/audio')
-rw-r--r--quantum/audio/audio.c17
-rw-r--r--quantum/audio/audio.h6
2 files changed, 1 insertions, 22 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 32f64417ed..3ca249fdf5 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -475,20 +475,3 @@ void increase_tempo(uint8_t tempo_change) {
note_tempo -= 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() {}
-
-__attribute__ ((weak))
-void audio_on_user() {}
-
-__attribute__ ((weak))
-void play_music_scale() {}
-//------------------------------------------------------------------------------
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index b46f587bb4..00d45f7ac1 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -5,6 +5,7 @@
#include "musical_notes.h"
#include "song_list.h"
#include "voices.h"
+#include "quantum.h"
#ifndef AUDIO_H
#define AUDIO_H
@@ -87,9 +88,4 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest)
bool is_playing_notes(void);
-void play_goodbye_tone(void);
-void play_startup_tone(void);
-void audio_on_user(void);
-void play_music_scale(void);
-
#endif \ No newline at end of file