X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3fd246041b10609a204a6352aa1b86d7000171d4..ad4308b1d123c36df674f553bb0c43f23cd7a99a:/Projects/XPLAINBridge/Lib/SoftUART.c?ds=inline

diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c
index 90c23b71d..b96b45f4d 100644
--- a/Projects/XPLAINBridge/Lib/SoftUART.c
+++ b/Projects/XPLAINBridge/Lib/SoftUART.c
@@ -51,7 +51,7 @@ static uint8_t RX_BitsRemaining;
 /** Temporary data variable to hold the byte being received as it is shifted in */
 static uint8_t RX_Data;
 
-/** Initializes the software UART, ready for data transmission and reception into the global ring buffers. */
+/** Initialises the software UART, ready for data transmission and reception into the global ring buffers. */
 void SoftUART_Init(void)
 {
 	/* Set TX pin to output high, enable RX pull-up */
@@ -63,12 +63,13 @@ void SoftUART_Init(void)
 	EICRA  = (1 << ISC01);
 	EIMSK  = (1 << INT0);
 
-	/* Set reception timer compare period and enable compare ISR */
-	OCR1A  = BIT_TIME;
+	/* Set the transmission and reception timer compare values for the default baud rate */
+	SoftUART_SetBaud(9600);
+
+	/* Setup reception timer compare ISR */
 	TIMSK1 = (1 << OCIE1A);
 
-	/* Set transmission timer compare period, enable compare ISR and start the timer */
-	OCR3A  = BIT_TIME;
+	/* Setup transmission timer compare ISR and start the timer */
 	TIMSK3 = (1 << OCIE3A);
 	TCCR3B = ((1 << CS30) | (1 << WGM32));
 }
@@ -124,7 +125,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
 }
 
 /** ISR to manage the transmission of bits via the software UART. */
-ISR(TIMER3_COMPA_vect, ISR_NOBLOCK)
+ISR(TIMER3_COMPA_vect, ISR_BLOCK)
 {
 	/* Check if transmission has finished */
 	if (TX_BitsRemaining)
@@ -139,7 +140,7 @@ ISR(TIMER3_COMPA_vect, ISR_NOBLOCK)
 		TX_Data >>= 1;
 		TX_BitsRemaining--;
 	}
-	else if (USBtoUART_Buffer.Count && !(RX_BitsRemaining))
+	else if (!(RX_BitsRemaining) && !(RingBuffer_IsEmpty(&USBtoUART_Buffer)))
 	{
 		/* Start bit - TX line low */
 		STXPORT &= ~(1 << STX);