Minor documentation adjustments to the demos, projects and bootloaders to ensure...

[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..dca97cb 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -40,7 +40,7 @@
                #include <avr/io.h>
                #include <avr/interrupt.h>
                #include <avr/wdt.h>
                #include <avr/io.h>
                #include <avr/interrupt.h>
                #include <avr/wdt.h>

-       
+

                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../Descriptors.h"
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../Descriptors.h"


@@ -58,14 +58,14 @@
                        #endif
                #endif
 
                        #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
                        #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
                #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
                        #define VTARGET_REF_MASK ADC_REFERENCE_INT2560MV
                #else
                        #define VTARGET_REF_MASK ADC_REFERENCE_AVCC


@@ -78,8 +78,8 @@
                /** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */
                #define COMMAND_TIMEOUT_TICKS      100
 
                /** 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
+               /** Command timeout ticks remaining counter, GPIOR for speed. */
+               #define TimeoutTicksRemaining      GPIOR1

 
                /** MUX mask for the VTARGET ADC channel number. */
                #define VTARGET_ADC_CHANNEL_MASK   ADC_GET_CHANNEL_MASK(VTARGET_ADC_CHANNEL)
 
                /** MUX mask for the VTARGET ADC channel number. */
                #define VTARGET_ADC_CHANNEL_MASK   ADC_GET_CHANNEL_MASK(VTARGET_ADC_CHANNEL)