Update Studio Integration DLL, to include package logging.

[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 10b9d14..c2335cc 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, 2010.
+     Copyright (C) Dean Camera, 2015.

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

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -37,13 +37,18 @@
 #define _V2_PROTOCOL_
 
        /* Includes: */
 #define _V2_PROTOCOL_
 
        /* Includes: */

+               #include <avr/io.h>
+               #include <avr/interrupt.h>
+               #include <avr/wdt.h>
+

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

-               #include "../Descriptors.h"
+               #include "../AVRISPDescriptors.h"

                #include "V2ProtocolConstants.h"
                #include "V2ProtocolParams.h"
                #include "ISP/ISPProtocol.h"
                #include "XPROG/XPROGProtocol.h"
                #include "V2ProtocolConstants.h"
                #include "V2ProtocolParams.h"
                #include "ISP/ISPProtocol.h"
                #include "XPROG/XPROGProtocol.h"

+               #include "Config/AppConfig.h"

 
        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
 
        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))


@@ -54,27 +59,31 @@
                        #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
 

-       /* Macros: */
-               #if !defined(__DOXYGEN__)
-                       #define _GETADCMUXMASK2(x, y)       x ## y
-                       #define _GETADCMUXMASK(x, y)        _GETADCMUXMASK2(x, y)
+               #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
 
                #endif
 

+       /* Macros: */

                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing. */
                #define PROGRAMMER_ID              "AVRISP_MK2"
 
                /** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */
                #define COMMAND_TIMEOUT_TICKS      100
 
                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing. */
                #define PROGRAMMER_ID              "AVRISP_MK2"
 
                /** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */
                #define COMMAND_TIMEOUT_TICKS      100
 

-               /** Command timeout counter register, GPIOR for speed. */
+               /** Command timeout ticks remaining counter, GPIOR for speed. */

                #define TimeoutTicksRemaining      GPIOR1
 
                /** MUX mask for the VTARGET ADC channel number. */
                #define TimeoutTicksRemaining      GPIOR1
 
                /** MUX mask for the VTARGET ADC channel number. */

-               #define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)
+               #define VTARGET_ADC_CHANNEL_MASK   ADC_GET_CHANNEL_MASK(VTARGET_ADC_CHANNEL)

 
        /* External Variables: */
                extern uint32_t CurrentAddress;
 
        /* External Variables: */
                extern uint32_t CurrentAddress;