Fix corner case in the HID report descriptor Mouse/Joystick tempates at the 8/16...

[pub/USBasp.git] / LUFA / CodeTemplates / makefile_template

diff --git a/LUFA/CodeTemplates/makefile_template b/LUFA/CodeTemplates/makefile_template
index 71afa9f..d893b4d 100644 (file)
--- a/LUFA/CodeTemplates/makefile_template
+++ b/LUFA/CodeTemplates/makefile_template
@@ -63,10 +63,14 @@
 MCU = ### INSERT NAME OF MICROCONTROLLER MODEL HERE ###\r
 \r
 \r
+# Target architecture (see library "Board Types" documentation).\r
+ARCH = ## INSERT NAME OF ARCHITECTURE HERE ##\r
+\r
+\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  = ### INSERT NAME OF BOARD HERE, OR NONE IF NO BOARD DRIVERS USED ###\r
+BOARD = ### INSERT NAME OF BOARD HERE, OR NONE IF NO BOARD DRIVERS USED ###\r
 \r
 \r
 # Processor frequency.\r
@@ -84,7 +88,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ###
 \r
 \r
 # Input clock frequency.\r
-#     This will define a symbol, F_CLOCK, in all source code files equal to the \r
+#     This will define a symbol, F_USB, in all source code files equal to the \r
 #     input clock frequency (before any prescaling is performed) in Hz. This value may\r
 #     differ from F_CPU if prescaling is used on the latter, and is required as the\r
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed\r
@@ -94,7 +98,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ###
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
-F_CLOCK = ### INSERT RAW INPUT CLOCK SPEED HERE, IN HZ ###\r
+F_USB = ### INSERT CLOCK TO USB MODULE HERE, IN HZ ###\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -516,7 +520,7 @@ flip: $(TARGET).hex
 \r
 dfu: $(TARGET).hex\r
        dfu-programmer $(MCU) erase\r
-       dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex\r
+       dfu-programmer $(MCU) flash $(TARGET).hex\r
        dfu-programmer $(MCU) reset\r
 \r
 flip-ee: $(TARGET).hex $(TARGET).eep\r
@@ -527,7 +531,7 @@ flip-ee: $(TARGET).hex $(TARGET).eep
        $(REMOVE) $(TARGET)eep.hex\r
 \r
 dfu-ee: $(TARGET).hex $(TARGET).eep\r
-       dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep\r
+       dfu-programmer $(MCU) eeprom-flash $(TARGET).eep\r
        dfu-programmer $(MCU) reset\r
 \r
 \r
@@ -677,8 +681,8 @@ clean_list :
        $(REMOVE) $(TARGET).map\r
        $(REMOVE) $(TARGET).sym\r
        $(REMOVE) $(TARGET).lss\r
-       $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)\r
-       $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)\r
+       $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)\r
+       $(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)\r
        $(REMOVE) $(SRC:.c=.s)\r
        $(REMOVE) $(SRC:.c=.d)\r
        $(REMOVE) $(SRC:.c=.i)\r