X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/9b29d1dc5045b74516e0ddd3ffcc200ef8ad9bff..dcedde012341a7cfff88c85203e735e99332627e:/Projects/XPLAINBridge/XPLAINBridge.c diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 5798c21a5..35a3951f4 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -86,9 +86,14 @@ int main(void) for (;;) { if (CurrentFirmwareMode == MODE_USART_BRIDGE) - USARTBridge_Task(); + { + USARTBridge_Task(); + } else - AVRISP_Task(); + { + AVRISP_Task(); + V2Params_UpdateParamValues(); + } USB_USBTask(); } @@ -121,20 +126,12 @@ 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 (!(RingBuffer_Empty(&UARTtoUSB_Buffer))) + if (UARTtoUSB_Buffer.Count) CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&UARTtoUSB_Buffer)); - - /* Load bytes from the UART transmit buffer into the UART */ - if (!(RingBuffer_Empty(&USBtoUART_Buffer)) && SoftUART_IsReady()) - SoftUART_TxByte(RingBuffer_Remove(&USBtoUART_Buffer)); - - /* Load bytes from the UART into the UART receive buffer */ - if (SoftUART_IsReceived()) - RingBuffer_Insert(&UARTtoUSB_Buffer, SoftUART_RxByte()); CDC_Device_USBTask(&VirtualSerial_CDC_Interface); } @@ -154,7 +151,7 @@ void SetupHardware(void) LEDs_Init(); USB_Init(); V2Protocol_Init(); - + /* Disable JTAG debugging */ MCUCR |= (1 << JTD); MCUCR |= (1 << JTD);