Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix #770, Fix #779

Browse source
This commit is contained in:
IBNobody 2016-09-28 20:26:41 -05:00
parent 72e643998f
commit 78767bf208
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tmk_core/common/avr/bootloader.c
View file

@ -38,7 +38,7 @@
* | | | | * | | | |
* = = = = * = = = =
* | | 32KB-4KB | | 128KB-8KB * | | 32KB-4KB | | 128KB-8KB
* 0x6000 +---------------+ 0x1FC00 +---------------+ * 0x7000 +---------------+ 0x1E000 +---------------+
* | Bootloader | 4KB | Bootloader | 8KB * | Bootloader | 4KB | Bootloader | 8KB
* 0x7FFF +---------------+ 0x1FFFF +---------------+ * 0x7FFF +---------------+ 0x1FFFF +---------------+
* *
@ -64,8 +64,8 @@
#define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE) #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 * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html
*/ */
#define BOOTLOADER_RESET_KEY 0xB007B007 #define BOOTLOADER_RESET_KEY 0xB007B007
@ -137,7 +137,7 @@ void bootloader_jump_after_watchdog_reset(void)
#if 0 #if 0
/* Jumping To The Bootloader /* Jumping To The Bootloader
* http://www.pjrc.com/teensy/jump_to_bootloader.html * http://www.pjrc.com/teensy/jump_to_bootloader.html
* *
* This method doen't work when using LUFA. idk why. * This method doen't work when using LUFA. idk why.
* - needs to initialize more regisers or interrupt setting? * - needs to initialize more regisers or interrupt setting?
*/ */

3
tmk_core/common/command.c
View file

@ -384,9 +384,6 @@ static bool command_common(uint8_t code)
debug_mouse = true; debug_mouse = true;
} else { } else {
print("\ndebug: off\n"); print("\ndebug: off\n");
debug_matrix = false;
debug_keyboard = false;
debug_mouse = false;
} }
break; break;