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 /tmk_core/common/command.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 'tmk_core/common/command.c')
-rw-r--r-- | tmk_core/common/command.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 9edcc42a0..024d7c67a 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c | |||
@@ -33,20 +33,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
33 | #include "led.h" | 33 | #include "led.h" |
34 | #include "command.h" | 34 | #include "command.h" |
35 | #include "backlight.h" | 35 | #include "backlight.h" |
36 | #include "quantum.h" | ||
36 | 37 | ||
37 | #ifdef MOUSEKEY_ENABLE | 38 | #ifdef MOUSEKEY_ENABLE |
38 | #include "mousekey.h" | 39 | #include "mousekey.h" |
39 | #endif | 40 | #endif |
40 | 41 | ||
41 | #ifdef PROTOCOL_PJRC | 42 | #ifdef PROTOCOL_PJRC |
42 | # include "usb_keyboard.h" | 43 | #include "usb_keyboard.h" |
43 | # ifdef EXTRAKEY_ENABLE | 44 | #ifdef EXTRAKEY_ENABLE |
44 | # include "usb_extra.h" | 45 | #include "usb_extra.h" |
45 | # endif | 46 | #endif |
46 | #endif | 47 | #endif |
47 | 48 | ||
48 | #ifdef PROTOCOL_VUSB | 49 | #ifdef PROTOCOL_VUSB |
49 | # include "usbdrv.h" | 50 | #include "usbdrv.h" |
50 | #endif | 51 | #endif |
51 | 52 | ||
52 | #ifdef AUDIO_ENABLE | 53 | #ifdef AUDIO_ENABLE |
@@ -358,7 +359,7 @@ static bool command_common(uint8_t code) | |||
358 | print("\n\nJumping to bootloader... "); | 359 | print("\n\nJumping to bootloader... "); |
359 | #ifdef AUDIO_ENABLE | 360 | #ifdef AUDIO_ENABLE |
360 | stop_all_notes(); | 361 | stop_all_notes(); |
361 | play_goodbye_tone(); | 362 | shutdown_user(); |
362 | #else | 363 | #else |
363 | _delay_ms(1000); | 364 | _delay_ms(1000); |
364 | #endif | 365 | #endif |