Improved readablitity

NicoHood · NicoHood · commit 6f7b59f6a6d5 · 2016-05-22T11:55:36.000+02:00
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,16 @@ void Application_Jump_Check(void)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/* On a power-on reset, we ALWAYS want to go to the sketch if there is one. */`
`105`		`- else if ((mcusr_state & (1 << PORF))) {`
	`105`	`+ else if (mcusr_state & (1 << PORF)) {`
`106`	`106`	`JumpToApplication = true;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/* On a watchdog reset, if the bootKey isn't set, and there's a sketch, we should just`
`110`	`110`	`* go straight to the sketch. */`
`111`		`- else if ((mcusr_state & (1 << WDRF)) && (MagicBootKey != MAGIC_BOOT_KEY)) {`
`112`		`- JumpToApplication = true;`
	`111`	`+ else if (mcusr_state & (1 << WDRF)) {`
	`112`	`+ if(MagicBootKey != MAGIC_BOOT_KEY){`
	`113`	`+ JumpToApplication = true;`
	`114`	`+ }`
`113`	`115`	`}`
`114`	`116`	`#elif ((BOARD == BOARD_XPLAIN) \|\| (BOARD == BOARD_XPLAIN_REV1))`
`115`	`117`	`/* Disable JTAG debugging */`