diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-21 22:15:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-21 22:15:52 +0000 |
| commit | d2851b335106293e5f95107226b5deeed712a69c (patch) | |
| tree | f3ac986d39cd156a21d9c8337d1e5bc83b929cb8 | |
| parent | 5e12d436fa31399ba6b5c8cab484d4a7b5adf7e7 (diff) | |
| download | lufa-d2851b335106293e5f95107226b5deeed712a69c.tar.gz lufa-d2851b335106293e5f95107226b5deeed712a69c.tar.bz2 lufa-d2851b335106293e5f95107226b5deeed712a69c.zip | |
Oops - need to revert changes made to ease testing of the software PDI programming mode.
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 1 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 22 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/makefile | 2 |
3 files changed, 3 insertions, 22 deletions
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c index 85a750454..f1bb45a29 100644 --- 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))
return;
+ /* Check to see if we are at a rising or falling edge of the clock */
if (BITBANG_PDICLOCK_PORT & BITBANG_PDICLOCK_MASK)
{
/* If at rising clock edge and we are in send mode, abort */
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h index 7ebed129c..0c54ad4cf 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h @@ -57,27 +57,7 @@ /* Defines: */
#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-// #define XPROG_VIA_HARDWARE_USART
-
- #define BITBANG_PDIDATA_PORT PORTD
- #define BITBANG_PDIDATA_DDR DDRD
- #define BITBANG_PDIDATA_PIN PIND
- #define BITBANG_PDIDATA_MASK (1 << 3)
-
- #define BITBANG_PDICLOCK_PORT PORTD
- #define BITBANG_PDICLOCK_DDR DDRD
- #define BITBANG_PDICLOCK_PIN PIND
- #define BITBANG_PDICLOCK_MASK (1 << 5)
-
- #define BITBANG_TPIDATA_PORT PORTB
- #define BITBANG_TPIDATA_DDR DDRB
- #define BITBANG_TPIDATA_PIN PINB
- #define BITBANG_TPIDATA_MASK (1 << 3)
-
- #define BITBANG_TPICLOCK_PORT PORTB
- #define BITBANG_TPICLOCK_DDR DDRB
- #define BITBANG_TPICLOCK_PIN PINB
- #define BITBANG_TPICLOCK_MASK (1 << 1)
+ #define XPROG_VIA_HARDWARE_USART
#else
#define BITBANG_PDIDATA_PORT PORTB
#define BITBANG_PDIDATA_DDR DDRB
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index b2c139cec..b0b26c24c 100644 --- 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
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory.
-BOARD = XPLAIN
+BOARD = USBKEY
# Processor frequency.
|