From 2eb47bea14a5c98eddcedbc4ff38583d9bfbb1d3 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 16 Jul 2012 17:11:14 +0000 Subject: Tag for the LUFA-120730-BETA release. git-svn-id: http://lufa-lib.googlecode.com/svn/tags/LUFA-120730-BETA@2407 d5102386-fcda-11dd-9fdb-3debd5008f28 --- Projects/AVRISP-MKII/AVRISPDescriptors.c | 8 ++++++-- Projects/AVRISP-MKII/AVRISPDescriptors.h | 2 ++ Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 2 +- Projects/AVRISP-MKII/makefile | 17 ++++++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) (limited to 'Projects/AVRISP-MKII') diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c index f3381e12..9ad7c154 100644 --- a/Projects/AVRISP-MKII/AVRISPDescriptors.c +++ b/Projects/AVRISP-MKII/AVRISPDescriptors.c @@ -38,6 +38,7 @@ #include "AVRISPDescriptors.h" #if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__) + /** Indicates if an external reset has occurred and the compatibility mode needs to be altered */ static bool AVRISP_NeedCompatibilitySwitch ATTR_NO_INIT; /** Current AVRISP data IN endpoint address. */ @@ -207,7 +208,8 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue, break; case DTYPE_Configuration: *DescriptorMemorySpace = MEMSPACE_RAM; - #if defined(RESET_TOGGLES_LIBUSB_COMPAT) + #if defined(RESET_TOGGLES_LIBUSB_COMPAT) + /* Update the configuration descriptor with the current endpoint address */ AVRISP_ConfigurationDescriptor.AVRISP_DataInEndpoint.EndpointAddress = AVRISP_CurrDataINEndpointAddress; #endif @@ -253,7 +255,7 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue, */ void CheckExternalReset(void) { - /* If an external reset occured, we need to change compatibility mode */ + /* If an external reset occurred, we need to change compatibility mode */ AVRISP_NeedCompatibilitySwitch = (MCUSR == (1 << EXTRF)); MCUSR = 0; @@ -307,5 +309,7 @@ void UpdateCurrentCompatibilityMode(void) } break; } + + Delay_MS(500); } #endif diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h index 2779e083..a14515d5 100644 --- a/Projects/AVRISP-MKII/AVRISPDescriptors.h +++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h @@ -41,6 +41,8 @@ #include #include + + #include "Config/AppConfig.h" /* Preprocessor Checks: */ #if defined(LIBUSB_DRIVER_COMPAT) && defined(RESET_TOGGLES_LIBUSB_COMPAT) diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index b77c1805..6bf74c87 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -361,7 +361,7 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, } /* Program complete - reset timeout */ - wdt_reset(); + TimeoutTicksRemaining = COMMAND_TIMEOUT_TICKS; return ProgrammingStatus; } diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index fd829964..ffc00b91 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -18,7 +18,7 @@ OPTIMIZATION = s TARGET = AVRISP-MKII SRC = $(TARGET).c AVRISPDescriptors.c Lib/V2Protocol.c Lib/V2ProtocolParams.c Lib/ISP/ISPProtocol.c Lib/ISP/ISPTarget.c Lib/XPROG/XPROGProtocol.c \ Lib/XPROG/XPROGTarget.c Lib/XPROG/XMEGANVM.c Lib/XPROG/TINYNVM.c $(LUFA_SRC_USB) -LUFA_PATH = ../../LUFA/ +LUFA_PATH = ../../LUFA CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ LD_FLAGS = @@ -26,9 +26,12 @@ LD_FLAGS = all: # Include LUFA build script makefiles -include $(LUFA_PATH)/Build/lufa.core.in -include $(LUFA_PATH)/Build/lufa.sources.in -include $(LUFA_PATH)/Build/lufa.build.in -include $(LUFA_PATH)/Build/lufa.doxygen.in -include $(LUFA_PATH)/Build/lufa.dfu.in -include $(LUFA_PATH)/Build/lufa.avrdude.in +include $(LUFA_PATH)/Build/lufa_core.mk +include $(LUFA_PATH)/Build/lufa_sources.mk +include $(LUFA_PATH)/Build/lufa_build.mk +include $(LUFA_PATH)/Build/lufa_cppcheck.mk +include $(LUFA_PATH)/Build/lufa_doxygen.mk +include $(LUFA_PATH)/Build/lufa_dfu.mk +include $(LUFA_PATH)/Build/lufa_hid.mk +include $(LUFA_PATH)/Build/lufa_avrdude.mk +include $(LUFA_PATH)/Build/lufa_atprogram.mk -- cgit v1.2.3