summaryrefslogtreecommitdiff
path: root/quantum/audio
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-15 00:40:59 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-15 00:40:59 -0400
commit15719f3574c6274ee0f3ec87431927c5a523aa3e (patch)
tree1a62fe2d064397f0cf27e77ed6934e08e5f6ee3e /quantum/audio
parent1a8c0dd22d6a2255511d0db6a456315541b5815b (diff)
adds a sequencer to the music mode (#330)
* implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * adds music sequencer functionality * implements audio/music functions in quantum.c * Merge branch 'master' into process-record
Diffstat (limited to 'quantum/audio')
-rw-r--r--quantum/audio/audio.c11
-rw-r--r--quantum/audio/audio.h1
2 files changed, 6 insertions, 6 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 27b64f8c96..243f49f0ee 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -478,12 +478,11 @@ 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()
-{
-}
+void play_startup_tone() {}
__attribute__ ((weak))
-void play_goodbye_tone()
-{
-}
+void play_goodbye_tone() {}
+
+__attribute__ ((weak))
+void audio_on_callback(void) {}
//------------------------------------------------------------------------------
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 4ba879bbb1..fe85061318 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -29,6 +29,7 @@ bool is_audio_on(void);
void audio_toggle(void);
void audio_on(void);
void audio_off(void);
+void audio_on_callback(void);
// Vibrato rate functions