Minor corrections to the XMEGA USB controller implementation.

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / V2Protocol.h

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 2511571..59752e5 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -40,7 +40,7 @@
                #include <avr/io.h>
                #include <avr/interrupt.h>
                #include <avr/wdt.h>
-       
+
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../Descriptors.h"
@@ -58,14 +58,14 @@
                        #endif
                #endif
 
-               #if defined(USB_SERIES_4_AVR) && ((VTARGET_ADC_CHANNEL == 2) || (VTARGET_ADC_CHANNEL == 3))
+               #if defined(USB_SERIES_4_AVR) && ((VTARGET_ADC_CHANNEL == 2) || (VTARGET_ADC_CHANNEL == 3)) && !defined(NO_VTARGET_DETECT)
                        #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