diff options
| author | dbroqua <dbroqua@mousur.org> | 2016-10-01 18:28:48 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2016-10-01 18:28:48 +0200 |
| commit | 7cd210722db2a1318209a7385ed29d4e62bfab18 (patch) | |
| tree | 279824e252a45f0a1b0d499bab36cbfbac5b28f6 /tmk_core | |
| parent | 8747c0786e7b583529d4033ea90aa91e49ae3a51 (diff) | |
| parent | 7abd3b4ddd0eb4ae4da6cce9283cfcf8089ac449 (diff) | |
| download | firmware-7cd210722db2a1318209a7385ed29d4e62bfab18.tar.gz firmware-7cd210722db2a1318209a7385ed29d4e62bfab18.tar.bz2 firmware-7cd210722db2a1318209a7385ed29d4e62bfab18.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tmk_core')
| -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..f3e1bf623 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -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; |