From 85cf2027373cfbe6f6fb257a84a59df0d74f3e1a Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 3 Nov 2010 11:24:34 +0000 Subject: Fixed USBtoSerial and XPLAINBridge demos discarding data from the PC if the send buffer becomes full. --- Projects/XPLAINBridge/XPLAINBridge.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'Projects/XPLAINBridge') diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 8cd1b2dd2..d645ebead 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -119,15 +119,21 @@ void UARTBridge_Task(void) if (USB_DeviceState != DEVICE_STATE_Configured) return; - /* Read bytes from the USB OUT endpoint into the UART transmit buffer */ - int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); - if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUART_Buffer))) - RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte); + /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */ + if (!(RingBuffer_IsFull(&USBtoUART_Buffer))) + { + int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); + /* Read bytes from the USB OUT endpoint into the UART transmit buffer */ + if (!(ReceivedByte < 0)) + RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte); + } + /* Check if the UART receive buffer flush timer has expired or buffer is nearly full */ RingBuff_Count_t BufferCount = RingBuffer_GetCount(&UARTtoUSB_Buffer); if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200)) { + /* Clear flush timer expiry flag */ TIFR0 |= (1 << TOV0); /* Read bytes from the UART receive buffer into the USB IN endpoint */ -- cgit v1.2.3