Commit 85aaaf84 authored by Dean Camera's avatar Dean Camera
Browse files

Make AVRISP-MKII clone project's software PDI/TPI mode more robust by keeping...

Make AVRISP-MKII clone project's software PDI/TPI mode more robust by keeping track of timeouts while waiting for a Tx/Rx to finish.
parent 3c7ff36c
...@@ -156,8 +156,7 @@ void XPROGTarget_EnableTargetPDI(void) ...@@ -156,8 +156,7 @@ void XPROGTarget_EnableTargetPDI(void)
PORTD |= (1 << 3); PORTD |= (1 << 3);
_delay_us(1); _delay_us(1);
/* Set up the synchronous USART for XMEGA communications - /* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */
8 data bits, even parity, 2 stop bits */
UBRR1 = (F_CPU / XPROG_HARDWARE_SPEED); UBRR1 = (F_CPU / XPROG_HARDWARE_SPEED);
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1); UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
...@@ -171,10 +170,9 @@ void XPROGTarget_EnableTargetPDI(void) ...@@ -171,10 +170,9 @@ void XPROGTarget_EnableTargetPDI(void)
_delay_us(1); _delay_us(1);
/* Fire timer compare channel A ISR to manage the software USART */ /* Fire timer compare channel A ISR to manage the software USART */
OCR1A = BITS_BETWEEN_USART_CLOCKS; OCR1A = BITS_BETWEEN_USART_CLOCKS;
OCR1B = BITS_BETWEEN_USART_CLOCKS; TCCR1B = (1 << WGM12) | (1 << CS10);
TCCR1B = (1 << WGM12) | (1 << CS10); TIMSK1 = (1 << OCIE1A);
TIMSK1 = (1 << OCIE1A);
#endif #endif
/* Send two BREAKs of 12 bits each to enable PDI interface (need at least 16 idle bits) */ /* Send two BREAKs of 12 bits each to enable PDI interface (need at least 16 idle bits) */
...@@ -197,8 +195,7 @@ void XPROGTarget_EnableTargetTPI(void) ...@@ -197,8 +195,7 @@ void XPROGTarget_EnableTargetTPI(void)
DDRD |= (1 << 5) | (1 << 3); DDRD |= (1 << 5) | (1 << 3);
DDRD &= ~(1 << 2); DDRD &= ~(1 << 2);
/* Set up the synchronous USART for TINY communications - /* Set up the synchronous USART for TINY communications - 8 data bits, even parity, 2 stop bits */
8 data bits, even parity, 2 stop bits */
UBRR1 = (F_CPU / XPROG_HARDWARE_SPEED); UBRR1 = (F_CPU / XPROG_HARDWARE_SPEED);
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1); UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
...@@ -211,9 +208,9 @@ void XPROGTarget_EnableTargetTPI(void) ...@@ -211,9 +208,9 @@ void XPROGTarget_EnableTargetTPI(void)
BITBANG_TPIDATA_PORT |= BITBANG_TPIDATA_MASK; BITBANG_TPIDATA_PORT |= BITBANG_TPIDATA_MASK;
/* Fire timer capture channel ISR to manage the software USART */ /* Fire timer capture channel ISR to manage the software USART */
ICR1 = BITS_BETWEEN_USART_CLOCKS; ICR1 = BITS_BETWEEN_USART_CLOCKS;
TCCR1B = (1 << WGM13) | (1 << WGM12) | (1 << CS10); TCCR1B = (1 << WGM13) | (1 << WGM12) | (1 << CS10);
TIMSK1 = (1 << ICIE1); TIMSK1 = (1 << ICIE1);
#endif #endif
/* Send two BREAKs of 12 bits each to enable TPI interface (need at least 16 idle bits) */ /* Send two BREAKs of 12 bits each to enable TPI interface (need at least 16 idle bits) */
...@@ -402,8 +399,15 @@ static void XPROGTarget_SetTxMode(void) ...@@ -402,8 +399,15 @@ static void XPROGTarget_SetTxMode(void)
IsSending = true; IsSending = true;
#else #else
while (SoftUSART_BitCount); while (SoftUSART_BitCount && TimeoutMSRemaining)
{
if (TIFR0 & (1 << OCF0A))
{
TIFR0 |= (1 << OCF0A);
TimeoutMSRemaining--;
}
}
/* Wait for a full cycle of the clock */ /* Wait for a full cycle of the clock */
SoftUSART_Data = 0x0001; SoftUSART_Data = 0x0001;
SoftUSART_BitCount = 1; SoftUSART_BitCount = 1;
...@@ -436,7 +440,14 @@ static void XPROGTarget_SetRxMode(void) ...@@ -436,7 +440,14 @@ static void XPROGTarget_SetRxMode(void)
DDRD &= ~(1 << 3); DDRD &= ~(1 << 3);
PORTD &= ~(1 << 3); PORTD &= ~(1 << 3);
#else #else
while (SoftUSART_BitCount); while (SoftUSART_BitCount && TimeoutMSRemaining)
{
if (TIFR0 & (1 << OCF0A))
{
TIFR0 |= (1 << OCF0A);
TimeoutMSRemaining--;
}
}
if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI) if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment