X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f64e3db07ac167bf0b64bf429a53721f1848e91d..2dabb4e55f1c362f63ef181469f529867ce8b03b:/Projects/XPLAINBridge/XPLAINBridge.c?ds=sidebyside diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 308c2abc3..4f3583e68 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,13 +126,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); } @@ -156,7 +161,7 @@ void SetupHardware(void) _delay_ms(10); /* Select the firmware mode based on the JTD pin's value */ - CurrentFirmwareMode = MODE_USART_BRIDGE;//(PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER; + CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER; /* Re-enable JTAG debugging */ MCUCR &= ~(1 << JTD);