diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-05-24 11:56:53 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-24 11:56:53 -0400 |
commit | 287eb7ad148abc8fe3fb014218d71e205fd9131d (patch) | |
tree | 59e800a739797cb86d9345d01f73fceee4c32030 /quantum/keymap_common.c | |
parent | 1ae6011cef2230826a9e6db6c5b638677bc640b7 (diff) | |
download | qmk_firmware-287eb7ad148abc8fe3fb014218d71e205fd9131d.tar.gz qmk_firmware-287eb7ad148abc8fe3fb014218d71e205fd9131d.zip |
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/keymap_common.c')
-rw-r--r-- | quantum/keymap_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 1d9ab2e05..ba7269388 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
26 | #include "backlight.h" | 26 | #include "backlight.h" |
27 | #include "bootloader.h" | 27 | #include "bootloader.h" |
28 | #include "eeconfig.h" | 28 | #include "eeconfig.h" |
29 | #include "quantum.h" | ||
29 | 30 | ||
30 | #ifdef MIDI_ENABLE | 31 | #ifdef MIDI_ENABLE |
31 | #include "keymap_midi.h" | 32 | #include "keymap_midi.h" |
@@ -190,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode) | |||
190 | clear_keyboard(); | 191 | clear_keyboard(); |
191 | #ifdef AUDIO_ENABLE | 192 | #ifdef AUDIO_ENABLE |
192 | stop_all_notes(); | 193 | stop_all_notes(); |
193 | play_goodbye_tone(); | 194 | shutdown_user(); |
194 | #endif | 195 | #endif |
195 | _delay_ms(250); | 196 | _delay_ms(250); |
196 | #ifdef ATREUS_ASTAR | 197 | #ifdef ATREUS_ASTAR |