Ensure TPI enable timing requirements are met in AVRISP-MKII programmer. Remove inval...

[pub/USBasp.git] / Projects / XPLAINBridge / makefile

diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index 4a15ba1..831d53b 100644 (file)
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
 # Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
-BOARD  = USER\r
+BOARD  = XPLAIN\r
 \r
 \r
 # Processor frequency.\r
@@ -114,6 +114,8 @@ OBJDIR = .
 # Path to the LUFA library\r
 LUFA_PATH = ../../\r
 \r
+# Path to the LUFA AVRISP-MKII project\r
+AVRISP_PATH = ../AVRISP-MKII/\r
 \r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
@@ -125,8 +127,18 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
-         Descriptors.c                                               \\r
+         AVRISPDescriptors.c                                         \\r
+         USARTDescriptors.c                                          \\r
          Lib/RingBuff.c                                              \\r
+         Lib/SoftUART.c                                              \\r
+         $(AVRISP_PATH)/Lib/V2Protocol.c                             \\r
+      $(AVRISP_PATH)/Lib/V2ProtocolParams.c                       \\r
+      $(AVRISP_PATH)/Lib/ISP/ISPProtocol.c                        \\r
+      $(AVRISP_PATH)/Lib/ISP/ISPTarget.c                          \\r
+         $(AVRISP_PATH)/Lib/XPROG/XPROGProtocol.c                    \\r
+         $(AVRISP_PATH)/Lib/XPROG/XPROGTarget.c                      \\r
+         $(AVRISP_PATH)/Lib/XPROG/XMEGANVM.c                         \\r
+         $(AVRISP_PATH)/Lib/XPROG/TINYNVM.c                          \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
@@ -152,7 +164,7 @@ CPPSRC =
 #     Even though the DOS/Win* filesystem matches both .s and .S the same,\r
 #     it will preserve the spelling of the filenames, and gcc itself does\r
 #     care about how the name is spelled on its command-line.\r
-ASRC = Lib/SoftUART.S\r
+ASRC = \r
 \r
 \r
 # Optimization level, can be [0, 1, 2, 3, s]. \r
@@ -172,7 +184,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r
-EXTRAINCDIRS = $(LUFA_PATH)/\r
+EXTRAINCDIRS = $(LUFA_PATH)/ $(AVRISP_PATH)/ \r
 \r
 \r
 # Compiler flag to set the C Standard level.\r
@@ -185,12 +197,11 @@ CSTANDARD = -std=gnu99
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
-CDEFS += -DAVR_RESET_LINE_PORT="PORTD"\r
-CDEFS += -DAVR_RESET_LINE_DDR="DDRD"\r
-CDEFS += -DAVR_RESET_LINE_MASK="(1 << 4)"\r
-CDEFS += -DAVR_RESET_PULSE_MS=10\r
-CDEFS += -DTX_RX_LED_PULSE_MS=30\r
-CDEFS += -DPING_PONG_LED_PULSE_MS=100\r
+CDEFS += -DAUX_LINE_PORT=PORTB\r
+CDEFS += -DAUX_LINE_PIN=PINB\r
+CDEFS += -DAUX_LINE_DDR=DDRB\r
+CDEFS += -DAUX_LINE_MASK="(1 << 4)"\r
+CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r