diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-05-18 23:14:00 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-18 23:14:00 -0400 |
| commit | 0428214b905e5f8b3bed721885957ce249ba4991 (patch) | |
| tree | e307462b501d077bb3aec774ebeb15e5f95dd5d7 /quantum/audio | |
| parent | 465aabe11dbd673fb4c68ecbffbfb062273def1a (diff) | |
| download | qmk_firmware-0428214b905e5f8b3bed721885957ce249ba4991.tar.gz qmk_firmware-0428214b905e5f8b3bed721885957ce249ba4991.zip | |
adds music and audio toggles (#337)
* 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
* music/audio_on_user
Diffstat (limited to 'quantum/audio')
| -rw-r--r-- | quantum/audio/audio.c | 8 | ||||
| -rw-r--r-- | quantum/audio/audio.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index 243f49f0ee..32f64417ed 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c @@ -381,11 +381,14 @@ bool is_audio_on(void) { void audio_toggle(void) { audio_config.enable ^= 1; eeconfig_update_audio(audio_config.raw); + if (audio_config.enable) + audio_on_user(); } void audio_on(void) { audio_config.enable = 1; eeconfig_update_audio(audio_config.raw); + audio_on_user(); } void audio_off(void) { @@ -484,5 +487,8 @@ __attribute__ ((weak)) void play_goodbye_tone() {} __attribute__ ((weak)) -void audio_on_callback(void) {} +void audio_on_user() {} + +__attribute__ ((weak)) +void play_music_scale() {} //------------------------------------------------------------------------------ diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h index fe85061318..b46f587bb4 100644 --- a/quantum/audio/audio.h +++ b/quantum/audio/audio.h @@ -29,7 +29,6 @@ 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 @@ -87,9 +86,10 @@ 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 |