projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.
[pub/USBasp.git]
/
Projects
/
AVRISP-MKII
/
AVRISPDescriptors.h
diff --git
a/Projects/AVRISP-MKII/AVRISPDescriptors.h
b/Projects/AVRISP-MKII/AVRISPDescriptors.h
index
2779e08
..
20725c5
100644
(file)
--- a/
Projects/AVRISP-MKII/AVRISPDescriptors.h
+++ b/
Projects/AVRISP-MKII/AVRISPDescriptors.h
@@
-41,6
+41,8
@@
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Board/LEDs.h>
+
+ #include "Config/AppConfig.h"
/* Preprocessor Checks: */
#if defined(LIBUSB_DRIVER_COMPAT) && defined(RESET_TOGGLES_LIBUSB_COMPAT)
/* Preprocessor Checks: */
#if defined(LIBUSB_DRIVER_COMPAT) && defined(RESET_TOGGLES_LIBUSB_COMPAT)
@@
-57,13
+59,13
@@
/** Endpoint address of the AVRISP data IN endpoint, when in LibUSB driver compatibility mode. */
#define AVRISP_DATA_IN_EPADDR_LIBUSB (ENDPOINT_DIR_IN | 3)
/** Endpoint address of the AVRISP data IN endpoint, when in LibUSB driver compatibility mode. */
#define AVRISP_DATA_IN_EPADDR_LIBUSB (ENDPOINT_DIR_IN | 3)
- #if !defined(LIBUSB_DRIVER_COMPAT) || defined(__DOXYGEN__)
- /** Endpoint address of the AVRISP data IN endpoint. */
- #define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_JUNGO
- #elif defined(RESET_TOGGLES_LIBUSB_COMPAT)
+ #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
#define AVRISP_DATA_IN_EPADDR AVRISP_CurrDataINEndpointAddress
#define AVRISP_DATA_IN_EPADDR AVRISP_CurrDataINEndpointAddress
- #el
se
+ #el
if defined(LIBUSB_DRIVER_COMPAT)
#define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_LIBUSB
#define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_LIBUSB
+ #else
+ /** Endpoint address of the AVRISP data IN endpoint. */
+ #define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_JUNGO
#endif
/** Size in bytes of the AVRISP data endpoint. */
#endif
/** Size in bytes of the AVRISP data endpoint. */