X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/271be037b736d66a7b7e0c4d5d30c5a24025277f..1ed6925b5bf417848b83887b32e3ede05a1c691b:/Projects/AVRISP/AVRISP.c

diff --git a/Projects/AVRISP/AVRISP.c b/Projects/AVRISP/AVRISP.c
index f14b6545a..c0572fca2 100644
--- a/Projects/AVRISP/AVRISP.c
+++ b/Projects/AVRISP/AVRISP.c
@@ -34,10 +34,6 @@
  *  the project and is responsible for the initial application hardware configuration.
  */
 
-// TODO: Add in software SPI for lower programming speeds below 125KHz
-// TODO: Add in VTARGET detection
-// TODO: Add reversed target connector checks
-
 #include "AVRISP.h"
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -47,14 +43,16 @@ int main(void)
 {
 	SetupHardware();
 
-	V2Params_LoadEEPROMParamValues();
+	V2Params_LoadNonVolatileParamValues();
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 
 	for (;;)
-	{
-		Process_AVRISP_Commands();
-
+	{
+		Process_AVRISP_Commands();
+		
+		V2Params_UpdateParamValues();
+		
 		USB_USBTask();
 	}
 }
@@ -73,7 +71,14 @@ void SetupHardware(void)
 	LEDs_Init();
 	USB_Init();
 
-	/* Millisecond timer initialization for timeout checking */
+	#if defined(ADC)
+	/* Initialize the ADC converter for VTARGET level detection on supported AVR models */
+	ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128);
+	ADC_SetupChannel(VTARGET_ADC_CHANNEL);
+	ADC_StartReading(VTARGET_ADC_CHANNEL | ADC_RIGHT_ADJUSTED | ADC_REFERENCE_AVCC);
+	#endif
+	
+	/* Millisecond timer initialization for timeouts and delays */
 	OCR0A  = ((F_CPU / 64) / 1000);
 	TCCR0A = (1 << WGM01);
 	TCCR0B = ((1 << CS01) | (1 << CS00));
@@ -106,20 +111,24 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 	}
 }
 
-/** Processes incomming V2 Protocol commands from the host, returning a response when required. */
-void Process_AVRISP_Commands(void)
-{
+/** Processes incoming V2 Protocol commands from the host, returning a response when required. */
+void Process_AVRISP_Commands(void)
+{
 	/* Device must be connected and configured for the task to run */
 	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
+	  return;
+
 	Endpoint_SelectEndpoint(AVRISP_DATA_EPNUM);
-	
-	/* Check to see if a V2 Protocol command has been received - if not, abort */
-	if (!(Endpoint_IsOUTReceived()))
-	  return;
-
-	/* Pass off processing of the V2 Protocol command to the V2 Protocol handler */
-	V2Protocol_ProcessCommand();
-}
-
+	
+	/* Check to see if a V2 Protocol command has been received */
+	if (Endpoint_IsOUTReceived())
+	{
+		LEDs_SetAllLEDs(LEDMASK_BUSY);
+
+		/* Pass off processing of the V2 Protocol command to the V2 Protocol handler */
+		V2Protocol_ProcessCommand();
+
+		LEDs_SetAllLEDs(LEDMASK_USB_READY);
+	}
+}
+