umm, fixed the #defines

trunk/Bootloaders/CDC/BootloaderCDC.c

@@ -64,18 +64,18 @@ volatile uint8_t boottimeout = 0;  // the counter we'll use
 void (*app_start)(void) = 0x0000;
 
 // we'll pulse the onboard LED to indicate the bootloader
-#if (BOARD == BOARD_MICROTOUCH)
-
-#define BOOTLOADERLED_DDR DDRC
-#define BOOTLOADERLED_PORT PORTC
-#define BOOTLOADERLED 7
-
-#elif (BOARD == ADAFRUIT32U4)
-
-#define BOOTLOADERLED_DDR DDRE
-#define BOOTLOADERLED_PORT PORTE
-#define BOOTLOADERLED 6
+#define BOARD_MICROTOUCH 1
+#define BOARD_ADAFRUIT32U4 2
 
+#if BOARD == BOARD_MICROTOUCH
+   #define BOOTLOADERLED_DDR DDRC
+   #define BOOTLOADERLED_PORT PORTC
+   #define BOOTLOADERLED 7
+#endif
+#if BOARD == BOARD_ADAFRUIT32U4
+   #define BOOTLOADERLED_DDR DDRE
+   #define BOOTLOADERLED_PORT PORTE
+   #define BOOTLOADERLED 6
 #endif
 
 /* End Adafruit Mods */
@@ -89,7 +89,7 @@ int main(void)
 {
   /* Adafruit Mods - unless they pressed the button, get out of the bootloader and into userland */
 
-#if (BOARD == BOARD_MICROTOUCH)
+#if BOARD == BOARD_MICROTOUCH
   DDRF |= _BV(0);
   PORTF |= _BV(0);
 #endif

trunk/Bootloaders/CDC/makefile

@@ -54,7 +54,9 @@ MCU = atmega32u4
 # Target board (see library "Board Types" documentation, NONE for projects not requiring
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called 
 # "Board" inside the application directory.
-BOARD  = MICROTOUCH
+
+#BOARD  = MICROTOUCH
+BOARD  = ADAFRUIT32U4
 
 
 # Processor frequency.