More improvements to the incomplete BluetoothHost demo - add Disconnection Event...

[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 862ea48..43dee1e 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -56,14 +56,28 @@
                #endif\r
 \r
        /* Macros: */\r
                #endif\r
 \r
        /* Macros: */\r

+               #if !defined(__DOXYGEN__)\r
+                       #define _GETADCMUXMASK2(x, y)       x ## y\r
+                       #define _GETADCMUXMASK(x, y)        _GETADCMUXMASK2(x, y)\r
+               #endif\r
+\r

                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */\r
                /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */\r

-               #define PROGRAMMER_ID       "AVRISP_MK2"\r
+               #define PROGRAMMER_ID              "AVRISP_MK2"\r

                \r
                /** Timeout period for each issued command from the host before it is aborted */\r
                \r
                /** Timeout period for each issued command from the host before it is aborted */\r

-               #define COMMAND_TIMEOUT_MS   200\r
+               #define COMMAND_TIMEOUT_MS         200\r

                \r
                /** Command timeout counter register, GPIOR for speed */\r
                \r
                /** Command timeout counter register, GPIOR for speed */\r

-               #define TimeoutMSRemaining   GPIOR0\r
+               #define TimeoutMSRemaining         GPIOR0\r
+\r
+               /** MUX mask for the VTARGET ADC channel number */\r
+               #define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)\r
+               \r
+               #if !defined(WIN_AVRDUDE_COMPAT)\r
+                       #define SELECT_DATA_OUT_ENDPOINT() Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);\r
+               #else\r
+                       #define SELECT_DATA_OUT_ENDPOINT() Endpoint_SelectEndpoint();\r
+               #endif\r

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


@@ -74,9 +88,9 @@
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r

-                       static void V2Protocol_UnknownCommand(uint8_t V2Command);\r
+                       static void V2Protocol_UnknownCommand(const uint8_t V2Command);\r

                        static void V2Protocol_SignOn(void);\r
                        static void V2Protocol_SignOn(void);\r

-                       static void V2Protocol_GetSetParam(uint8_t V2Command);\r
+                       static void V2Protocol_GetSetParam(const uint8_t V2Command);\r

                        static void V2Protocol_ResetProtection(void);\r
                        static void V2Protocol_LoadAddress(void);\r
                #endif\r
                        static void V2Protocol_ResetProtection(void);\r
                        static void V2Protocol_LoadAddress(void);\r
                #endif\r