Make XPLAINBridge serial bridge much more reliable for the reception of characters...

[pub/USBasp.git] / Projects / XPLAINBridge / XPLAINBridge.c

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 308c2ab..2a71c56 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -86,7 +86,7 @@ int main(void)
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)
-                 USARTBridge_Task();
+                 UARTBridge_Task();
                else
                  AVRISP_Task();
 
@@ -100,6 +100,8 @@ void AVRISP_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
+       V2Params_UpdateParamValues();
+
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */
@@ -114,20 +116,20 @@ void AVRISP_Task(void)
        }
 }
 
-void USARTBridge_Task(void)
+void UARTBridge_Task(void)
 {
        /* Must be in the configured state for the USART Bridge code to process data */
        if (USB_DeviceState != DEVICE_STATE_Configured)
          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);
 }
 
@@ -146,17 +148,17 @@ void SetupHardware(void)
        LEDs_Init();
        USB_Init();
        V2Protocol_Init();
-       
+
        /* Disable JTAG debugging */
        MCUCR |= (1 << JTD);
        MCUCR |= (1 << JTD);
 
-       /* Enable pullup on the JTAG TDI pin so we can use it to select the mode */
+       /* Enable pull-up on the JTAG TDI pin so we can use it to select the mode */
        PORTF |= (1 << 7);
        _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);