~ruther/qmk_firmware

78767bf2084a1d63edd0957e09048d34ef448380 — IBNobody 9 years ago 72e6439
Fix #770, Fix #779
2 files changed, 4 insertions(+), 7 deletions(-)

M tmk_core/common/avr/bootloader.c
M tmk_core/common/command.c
M tmk_core/common/avr/bootloader.c => tmk_core/common/avr/bootloader.c +4 -4
@@ 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?
 */

M tmk_core/common/command.c => tmk_core/common/command.c +0 -3
@@ 384,9 384,6 @@ static bool command_common(uint8_t code)
                debug_mouse    = true;
            } else {
                print("\ndebug: off\n");
                debug_matrix   = false;
                debug_keyboard = false;
                debug_mouse    = false;
            }
            break;