Skip to content

Commit

Permalink
Improved readablitity
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoHood committed May 22, 2016
1 parent 3a89db6 commit 6f7b59f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Bootloaders/CDC/BootloaderCDC.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,16 @@ void Application_Jump_Check(void)
}

/* On a power-on reset, we ALWAYS want to go to the sketch if there is one. */
else if ((mcusr_state & (1 << PORF))) {
else if (mcusr_state & (1 << PORF)) {
JumpToApplication = true;
}

/* On a watchdog reset, if the bootKey isn't set, and there's a sketch, we should just
* go straight to the sketch. */
else if ((mcusr_state & (1 << WDRF)) && (MagicBootKey != MAGIC_BOOT_KEY)) {
JumpToApplication = true;
else if (mcusr_state & (1 << WDRF)) {
if(MagicBootKey != MAGIC_BOOT_KEY){
JumpToApplication = true;
}
}
#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
/* Disable JTAG debugging */
Expand Down

0 comments on commit 6f7b59f

Please sign in to comment.