Oops - need to revert changes made to ease testing of the software PDI programming...

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 85a7504..f1bb45a 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -59,6 +59,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        if (!(SoftUSART_BitCount))\r
          return;\r
 \r
+       /* Check to see if we are at a rising or falling edge of the clock */\r
        if (BITBANG_PDICLOCK_PORT & BITBANG_PDICLOCK_MASK)\r
        {\r
                /* If at rising clock edge and we are in send mode, abort */\r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 7ebed12..0c54ad4 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -57,27 +57,7 @@
 \r
        /* Defines: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
-//                     #define XPROG_VIA_HARDWARE_USART\r
-\r
-                       #define BITBANG_PDIDATA_PORT     PORTD\r
-                       #define BITBANG_PDIDATA_DDR      DDRD\r
-                       #define BITBANG_PDIDATA_PIN      PIND\r
-                       #define BITBANG_PDIDATA_MASK     (1 << 3)\r
-                       \r
-                       #define BITBANG_PDICLOCK_PORT    PORTD\r
-                       #define BITBANG_PDICLOCK_DDR     DDRD\r
-                       #define BITBANG_PDICLOCK_PIN     PIND\r
-                       #define BITBANG_PDICLOCK_MASK    (1 << 5)\r
-\r
-                       #define BITBANG_TPIDATA_PORT     PORTB\r
-                       #define BITBANG_TPIDATA_DDR      DDRB\r
-                       #define BITBANG_TPIDATA_PIN      PINB\r
-                       #define BITBANG_TPIDATA_MASK     (1 << 3)\r
-                               \r
-                       #define BITBANG_TPICLOCK_PORT    PORTB\r
-                       #define BITBANG_TPICLOCK_DDR     DDRB\r
-                       #define BITBANG_TPICLOCK_PIN     PINB\r
-                       #define BITBANG_TPICLOCK_MASK    (1 << 1)\r
+                       #define XPROG_VIA_HARDWARE_USART\r
                #else\r
                        #define BITBANG_PDIDATA_PORT     PORTB\r
                        #define BITBANG_PDIDATA_DDR      DDRB\r

diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index b2c139c..b0b26c2 100644 (file)
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
 # 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 = XPLAIN\r
+BOARD = USBKEY\r
 \r
 \r
 # Processor frequency.\r