X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/036a156ff4518212ee1db487ce644deeca91bb71..55d7e1e65bccd6b4c44802cf971f39eb05e6e57a:/Projects/XPLAINBridge/XPLAINBridge.c

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index a0766f1f9..2a71c5617 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -86,14 +86,9 @@ int main(void)
 	for (;;)
 	{
 		if (CurrentFirmwareMode == MODE_USART_BRIDGE)
-		{
-			USARTBridge_Task();
-		}
+		  UARTBridge_Task();
 		else
-		{
-			AVRISP_Task();
-			V2Params_UpdateParamValues();
-		}
+		  AVRISP_Task();
 
 		USB_USBTask();
 	}
@@ -105,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 */
@@ -119,7 +116,7 @@ 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)
@@ -156,7 +153,7 @@ void SetupHardware(void)
 	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);
 
@@ -166,8 +163,6 @@ void SetupHardware(void)
 	/* Re-enable JTAG debugging */
 	MCUCR &= ~(1 << JTD);
 	MCUCR &= ~(1 << JTD);
-
-	CurrentFirmwareMode = MODE_USART_BRIDGE; // TEMP
 }
 
 /** Event handler for the library USB Configuration Changed event. */