X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ea922c98d187eb74c31535afa3334ead5bd50526..eea687e6d9524e252d3ae50f06b33f4e753dcf2b:/Projects/AVRISP-MKII/Lib/V2Protocol.h

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index c2f0ee072..2511571f9 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -37,17 +37,12 @@
 #define _V2_PROTOCOL_
 
 	/* Includes: */
-		#include <LUFA/Common/Common.h>
+		#include <avr/io.h>
+		#include <avr/interrupt.h>
+		#include <avr/wdt.h>
+	
 		#include <LUFA/Drivers/USB/USB.h>
 
-		#if (ARCH == ARCH_AVR8)
-			#include <avr/io.h>
-			#include <avr/interrupt.h>
-			#include <avr/wdt.h>
-		#elif (ARCH == ARCH_UC3)
-			#include <avr32/io.h>
-		#endif
-		
 		#include "../Descriptors.h"
 		#include "V2ProtocolConstants.h"
 		#include "V2ProtocolParams.h"
@@ -66,6 +61,15 @@
 		#if defined(USB_SERIES_4_AVR) && ((VTARGET_ADC_CHANNEL == 2) || (VTARGET_ADC_CHANNEL == 3))
 			#error The U4 AVR chips do not contain ADC channels 2 or 3. Please change VTARGET_ADC_CHANNEL or define NO_VTARGET_DETECT in the makefile.
 		#endif
+		
+		#if defined(VTARGET_USE_INTERNAL_REF)
+			#undef  VTARGET_REF_VOLTS
+			#define VTARGET_REF_VOLTS 2.56
+			
+			#define VTARGET_REF_MASK ADC_REFERENCE_INT2560MV
+		#else
+			#define VTARGET_REF_MASK ADC_REFERENCE_AVCC
+		#endif
 
 	/* Macros: */
 		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing. */
@@ -74,13 +78,15 @@
 		/** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */
 		#define COMMAND_TIMEOUT_TICKS      100
 
+		/** Command timeout expiration flag, GPIOR for speed. */
+		#define TimeoutExpired             GPIOR1
+
 		/** MUX mask for the VTARGET ADC channel number. */
 		#define VTARGET_ADC_CHANNEL_MASK   ADC_GET_CHANNEL_MASK(VTARGET_ADC_CHANNEL)
 
 	/* External Variables: */
-		extern uint32_t      CurrentAddress;
-		extern bool          MustLoadExtendedAddress;
-		extern volatile bool TimeoutExpired;
+		extern uint32_t CurrentAddress;
+		extern bool     MustLoadExtendedAddress;
 
 	/* Function Prototypes: */
 		void V2Protocol_Init(void);