aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-10-18 11:31:03 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-10-18 11:31:03 +0000
commit3aa8a69246942c27a389950caad0374ffb3e6056 (patch)
tree18b81a49ed1fa200b2709d9a3acfe36e89907903
parent738c9203fccfdcd11e4fc5bcb3ca4d102d15e1cd (diff)
downloadlufa-3aa8a69246942c27a389950caad0374ffb3e6056.tar.gz
lufa-3aa8a69246942c27a389950caad0374ffb3e6056.tar.bz2
lufa-3aa8a69246942c27a389950caad0374ffb3e6056.zip
Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled.
-rw-r--r--LUFA/ManPages/ChangeLog.txt1
-rw-r--r--Projects/AVRISP-MKII/Lib/V2Protocol.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4bb153ce8..5e917efed 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -25,6 +25,7 @@
* - Fixed ring buffer size limited to 255 elements, instead of the intended 65535 elements.
* - Library Applications:
* - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
+ * - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled
*
* \section Sec_ChangeLog111009 Version 111009
* <b>New:</b>
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 2511571f9..33ef431cd 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -58,7 +58,7 @@
#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