From bbf9d14bf90424bf8246bda2938d7c026a682cf2 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 20 Mar 2012 20:44:01 +0000
Subject: [PATCH] Fixed AVRISP-MKII programmer project failing to compile for
the U4 chips when VTARGET_ADC_CHANNEL is defined to an invalid channel and
NO_VTARGET_DETECT is defined (thanks to Steven Morehouse).
---
LUFA/DoxygenPages/ChangeLog.txt | 2 ++
Projects/AVRISP-MKII/Lib/V2Protocol.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index ba9c80558..6e818a10e 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -31,6 +31,8 @@
* - Fixed inverted LED logic in the OLIMEX162 board LED driver
* - Library Applications:
* - Fixed error in the AVRISP-MKII programmer when ISP mode is used at 64KHz (thanks to Ben R. Porter)
+ * - Fixed AVRISP-MKII programmer project failing to compile for the U4 chips when VTARGET_ADC_CHANNEL is defined to an invalid channel and NO_VTARGET_DETECT is
+ * defined (thanks to Steven Morehouse)
*
* \section Sec_ChangeLog120219 Version 120219
* <b>New:</b>
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
index fa3d6a342..780c48af4 100644
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.c
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -53,7 +53,7 @@ ISR(WDT_vect, ISR_BLOCK)
/** Initializes the hardware and software associated with the V2 protocol command handling. */
void V2Protocol_Init(void)
{
- #if defined(ADC)
+ #if defined(ADC) && !defined(NO_VTARGET_DETECT)
/* Initialize the ADC converter for VTARGET level detection on supported AVR models */
ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128);
ADC_SetupChannel(VTARGET_ADC_CHANNEL);
--
GitLab