Renamed the PRNT_Host_SendString(), CDC_Host_SendString() and CDC_Device_SendString...

[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 4f5950b..8e9e6ff 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -39,6 +39,7 @@
        /* Includes: */
                #include <avr/io.h>
                #include <avr/interrupt.h>
        /* 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>
 


@@ -62,22 +63,17 @@
                #endif
 
        /* Macros: */
                #endif
 
        /* Macros: */

-               #if !defined(__DOXYGEN__)
-                       #define _GETADCMUXMASK2(x, y)       x ## y
-                       #define _GETADCMUXMASK(x, y)        _GETADCMUXMASK2(x, y)
-               #endif
-

                /** 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. */
-               #define TimeoutTicksRemaining      GPIOR1
+               /** Command timeout expiration flag, GPIOR for speed. */
+               #define TimeoutExpired             GPIOR1

 
                /** MUX mask for the VTARGET ADC channel number. */
 
                /** 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;