aboutsummaryrefslogtreecommitdiff
path: root/Projects/XPLAINBridge/makefile
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-05-20 17:09:39 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-05-20 17:09:39 +0000
commitcc3ee891c9316e3106a5b6379c9e9e1b1cb1c195 (patch)
treea8df9f72605f3f069fa42a67d35ba6874cc0144d /Projects/XPLAINBridge/makefile
parent2160eecb08695237cf3d5263bc41ca149369e65b (diff)
Alter the XPLAINBridge and AVRISP-MKII clone projects so that the descriptors from the AVRISP-MKII clone project can be directly used in the XPLAINBridge project. Add support for RESET_TOGGLES_LIBUSB_COMPAT option in the XPLAINBridge project.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2231 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/XPLAINBridge/makefile')
-rw-r--r--Projects/XPLAINBridge/makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index fe4b8aea..32690d50 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -129,7 +129,6 @@ LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
LUFA_OPTS += -D ORDERED_EP_CONFIG
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16
LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
LUFA_OPTS += -D NO_DEVICE_SELF_POWER
@@ -141,6 +140,7 @@ LUFA_OPTS += -D AUX_LINE_MASK="(1 << 4)"
LUFA_OPTS += -D VTARGET_ADC_CHANNEL=2
LUFA_OPTS += -D VTARGET_REF_VOLTS=3.3
LUFA_OPTS += -D VTARGET_SCALE_FACTOR=2
+#LUFA_OPTS += -D RESET_TOGGLES_LIBUSB_COMPAT
#LUFA_OPTS += -D LIBUSB_DRIVER_COMPAT
#LUFA_OPTS += -D FIRMWARE_VERSION_MINOR=0x11
@@ -150,9 +150,9 @@ include $(LUFA_PATH)/LUFA/makefile
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
- AVRISPDescriptors.c \
- USARTDescriptors.c \
Lib/SoftUART.c \
+ USARTDescriptors.c \
+ $(AVRISP_PATH)/AVRISPDescriptors.c \
$(AVRISP_PATH)/Lib/V2Protocol.c \
$(AVRISP_PATH)/Lib/V2ProtocolParams.c \
$(AVRISP_PATH)/Lib/ISP/ISPProtocol.c \