ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AppConfigHeaders: Merge in latest trunk.

Browse source
This commit is contained in:
Dean Camera 2012-05-21 20:48:57 +00:00
commit 5ec9d04bca
4 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Bootloaders/CDC/BootloaderCDC.c
View file

@ -73,7 +73,13 @@ void Application_Jump_Check(void)
/* If the reset source was the bootloader and the key is correct, clear it and jump to the application */
if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
{
/* Turn off the watchdog */
MCUSR &= ~(1<<WDRF);
wdt_disable();
/* Clear the boot key and jump to the user application */
MagicBootKey = 0;
// cppcheck-suppress constStatement
((void (*)(void))0x0000)();
}

11
Bootloaders/DFU/BootloaderDFU.c
View file

@ -106,11 +106,18 @@ uint32_t MagicBootKey ATTR_NO_INIT;
*/
void Application_Jump_Check(void)
{
// If the reset source was the bootloader and the key is correct, clear it and jump to the application
/* If the reset source was the bootloader and the key is correct, clear it and jump to the application */
if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
{
/* Turn off the watchdog */
MCUSR &= ~(1<<WDRF);
wdt_disable();
/* Clear the boot key and jump to the user application */
MagicBootKey = 0;
AppStartPtr();
// cppcheck-suppress constStatement
((void (*)(void))0x0000)();
}
}