From d2851b335106293e5f95107226b5deeed712a69c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 21 Feb 2010 22:15:52 +0000 Subject: Oops - need to revert changes made to ease testing of the software PDI programming mode. --- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 1 + Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 22 +--------------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib') 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 -- cgit v1.2.3