Added incomplete MIDIToneGenerator project.

[pub/USBasp.git] / Projects / AVRISP-MKII / makefile

diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index f5bb5b7..b0b26c2 100644 (file)
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\r
 \r
 \r
 MCU = at90usb1287\r
 \r
 \r

-# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, NONE 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 = USBKEY\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 BOARD = USBKEY\r


@@ -119,7 +119,6 @@ LUFA_PATH = ../../
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r

-LUFA_OPTS += -D NO_STREAM_CALLBACKS\r

 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 \r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 \r


@@ -191,13 +190,15 @@ 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
 \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 += -DRESET_LINE_PORT=PORTB\r
-CDEFS += -DRESET_LINE_PIN=PINB\r
-CDEFS += -DRESET_LINE_DDR=DDRB\r
-CDEFS += -DRESET_LINE_MASK="(1 << 4)"\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
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 CDEFS += -DENABLE_ISP_PROTOCOL\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r

+#CDEFS += -DXPROG_VIA_HARDWARE_USART\r
+#CDEFS += -DNO_VTARGET_DETECT\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r