ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace ring buffer library in Benito and USBtoSerial projects with the new lightweight ring buffer header to improve reliability.

Browse source
This commit is contained in:
Dean Camera 2010-05-26 13:26:10 +00:00
parent 885170f5b4
commit 8d993afc53
16 changed files with 206 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/XPLAINBridge/Lib/SoftUART.c
View file

@ -40,7 +40,7 @@
#include "SoftUART.h"
/** Total number of bits remaining to be sent in the current frame */
static uint8_t TX_BitsRemaining
static uint8_t TX_BitsRemaining;
/** Temporary data variable to hold the byte being transmitted as it is shifted out */
static uint8_t TX_Data;
@ -76,7 +76,7 @@ void SoftUART_Init(void)
ISR(INT0_vect)
{
/* Set reception channel to fire 1.5 bits past the beginning of the start bit */
OCR1A = TCNT1 + ((BIT_TIME * 3) / 2) - 1;
OCR1A = TCNT1 + ((BIT_TIME * 3) / 2);
/* Clear the received data temporary variable, reset the current received bit position mask */
RX_Data = 0;

8
Projects/XPLAINBridge/XPLAINBridge.c
View file

@ -121,13 +121,13 @@ void USARTBridge_Task(void)
return;
/* Read bytes from the USB OUT endpoint into the UART transmit buffer */
for (uint8_t DataBytesRem = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); DataBytesRem != 0; DataBytesRem--)
if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
RingBuffer_Insert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
/* Read bytes from the UART receive buffer into the USB IN endpoint */
if (UARTtoUSB_Buffer.Count)
CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&UARTtoUSB_Buffer));
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
}
@ -147,6 +147,7 @@ void SetupHardware(void)
USB_Init();
V2Protocol_Init();
#if 0
/* Disable JTAG debugging */
MCUCR |= (1 << JTD);
MCUCR |= (1 << JTD);
@ -161,6 +162,9 @@ void SetupHardware(void)
/* Re-enable JTAG debugging */
MCUCR &= ~(1 << JTD);
MCUCR &= ~(1 << JTD);
#endif
CurrentFirmwareMode = MODE_USART_BRIDGE;
}
/** Event handler for the library USB Configuration Changed event. */