X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/4c637c93ba69e33c77034eef9bd4433252e139fc..e1cf5fc2a617e4b642f2eef6e6c32b751d5e9227:/Bootloaders/Printer/BootloaderPrinter.c

diff --git a/Bootloaders/Printer/BootloaderPrinter.c b/Bootloaders/Printer/BootloaderPrinter.c
index 151d16f92..da4162172 100644
--- a/Bootloaders/Printer/BootloaderPrinter.c
+++ b/Bootloaders/Printer/BootloaderPrinter.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2014.
+     Copyright (C) Dean Camera, 2018.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2014  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -146,14 +146,25 @@ void Application_Jump_Check(void)
 		JTAG_ENABLE();
 	#else
 		/* Check if the device's BOOTRST fuse is set */
-		if (boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS) & FUSE_BOOTRST)
+		if (BootloaderAPI_ReadFuse(GET_HIGH_FUSE_BITS) & FUSE_BOOTRST)
 		{
 			/* If the reset source was not an external reset or the key is correct, clear it and jump to the application */
 			if (!(MCUSR & (1 << EXTRF)) || (MagicBootKey == MAGIC_BOOT_KEY))
 			  JumpToApplication = true;
 
+			/* Clear reset source */
 			MCUSR &= ~(1 << EXTRF);
 		}
+		else
+		{
+			/* If the reset source was the bootloader and the key is correct, clear it and jump to the application;
+			 * this can happen in the HWBE fuse is set, and the HBE pin is low during the watchdog reset */
+			if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY))
+				JumpToApplication = true;
+
+			/* Clear reset source */
+			MCUSR &= ~(1 << WDRF);
+		}
 	#endif
 
 	/* Don't run the user application if the reset vector is blank (no app loaded) */
@@ -210,8 +221,7 @@ static void FlushPageIfRequired(void)
 	uint32_t NewPageStartAddress = (HEXParser.CurrAddress & ~(SPM_PAGESIZE - 1));
 	if (HEXParser.PageStartAddress != NewPageStartAddress)
 	{
-		boot_page_write(HEXParser.PageStartAddress);
-		boot_spm_busy_wait();
+		BootloaderAPI_WritePage(HEXParser.PageStartAddress);
 
 		HEXParser.PageStartAddress = NewPageStartAddress;
 
@@ -310,14 +320,13 @@ static void ParseIntelHEXByte(const char ReadCharacter)
 					/* If we are writing to a new page, we need to erase it first */
 					if (!(PageDirty))
 					{
-						boot_page_erase(HEXParser.PageStartAddress);
-						boot_spm_busy_wait();
+						BootloaderAPI_ErasePage(HEXParser.PageStartAddress);
 
 						PageDirty = true;
 					}
 
 					/* Fill the FLASH memory buffer with the new word of data */
-					boot_page_fill(HEXParser.CurrAddress, NewDataWord);
+					BootloaderAPI_FillWord(HEXParser.CurrAddress, NewDataWord);
 					HEXParser.CurrAddress += 2;
 
 					/* Flush the FLASH page to physical memory if we are crossing a page boundary */
@@ -392,6 +401,9 @@ int main(void)
 		USB_USBTask();
 	}
 
+	/* Wait a short time to end all USB transactions and then disconnect */
+	_delay_us(1000);
+
 	/* Disconnect from the host - USB interface will be reset later along with the AVR */
 	USB_Detach();