diff options
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/command.c | 13 | ||||
-rw-r--r-- | tmk_core/rules.mk | 8 |
2 files changed, 14 insertions, 7 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 |
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 552f32331..1d384574f 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk | |||
@@ -366,7 +366,13 @@ ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS) | |||
366 | 366 | ||
367 | 367 | ||
368 | # Default target. | 368 | # Default target. |
369 | all: begin gccversion sizebefore build sizeafter end | 369 | all: |
370 | $(MAKE) begin | ||
371 | $(MAKE) gccversion | ||
372 | $(MAKE) sizebefore | ||
373 | $(MAKE) build | ||
374 | $(MAKE) sizeafter | ||
375 | $(MAKE) end | ||
370 | 376 | ||
371 | # Change the build target to build a HEX file or a library. | 377 | # Change the build target to build a HEX file or a library. |
372 | build: elf hex eep lss sym | 378 | build: elf hex eep lss sym |