diff options
| author | IBNobody <protospherex@gmail.com> | 2016-10-29 11:13:15 -0500 |
|---|---|---|
| committer | IBNobody <protospherex@gmail.com> | 2016-10-29 11:13:15 -0500 |
| commit | e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc (patch) | |
| tree | bf372a8afead88128f68d373435025a16fbf53c2 /tmk_core/common | |
| parent | 973f526bb4928bf3aec6067aa444b31ace997c8a (diff) | |
| parent | 32f88c07173b795c6981c779057dceba00aeb1cb (diff) | |
| download | firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.tar.gz firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.tar.bz2 firmware-e40c33f754a86c4dd7bd3c7b5c7efe822f2893bc.zip | |
Merge branch 'master' of https://github.com/IBNobody/qmk_firmware
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 8 | ||||
| -rw-r--r-- | tmk_core/common/command.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index fb9bf2d1c..ad547b985 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c @@ -38,7 +38,7 @@ * | | | | * = = = = * | | 32KB-4KB | | 128KB-8KB - * 0x6000 +---------------+ 0x1FC00 +---------------+ + * 0x7000 +---------------+ 0x1E000 +---------------+ * | Bootloader | 4KB | Bootloader | 8KB * 0x7FFF +---------------+ 0x1FFFF +---------------+ * @@ -64,8 +64,8 @@ #define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE) -/* - * Entering the Bootloader via Software +/* + * Entering the Bootloader via Software * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html */ #define BOOTLOADER_RESET_KEY 0xB007B007 @@ -137,7 +137,7 @@ void bootloader_jump_after_watchdog_reset(void) #if 0 /* Jumping To The Bootloader * http://www.pjrc.com/teensy/jump_to_bootloader.html - * + * * This method doen't work when using LUFA. idk why. * - needs to initialize more regisers or interrupt setting? */ diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index fc5aad5c1..5f29bc0b4 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -379,9 +379,6 @@ static bool command_common(uint8_t code) debug_enable = !debug_enable; if (debug_enable) { print("\ndebug: on\n"); - debug_matrix = true; - debug_keyboard = true; - debug_mouse = true; } else { print("\ndebug: off\n"); debug_matrix = false; |