From 32830a2b827cbeb40284c5ea379381948fb9113e Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 16 Jan 2011 16:13:22 +0000 Subject: Added new ADC_GET_CHANNEL_MASK() convenience macro to the ADC driver. --- Projects/AVRISP-MKII/Lib/V2Protocol.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Projects/AVRISP-MKII') diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h index 4f5950b18..ed42de96e 100644 --- a/Projects/AVRISP-MKII/Lib/V2Protocol.h +++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h @@ -62,11 +62,6 @@ #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" @@ -77,7 +72,7 @@ #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; -- cgit v1.2.3