ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source
This commit is contained in:
Dean Camera 2012-03-20 20:44:01 +00:00
parent a77c3edc37
commit bbf9d14bf9
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LUFA/DoxygenPages/ChangeLog.txt
View file

@ -31,6 +31,8 @@
* - Fixed inverted LED logic in the OLIMEX162 board LED driver * - Fixed inverted LED logic in the OLIMEX162 board LED driver
* - Library Applications: * - Library Applications:
* - Fixed error in the AVRISP-MKII programmer when ISP mode is used at 64KHz (thanks to Ben R. Porter) * - 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 * \section Sec_ChangeLog120219 Version 120219
* <b>New:</b> * <b>New:</b>

2
Projects/AVRISP-MKII/Lib/V2Protocol.c
View file

@ -53,7 +53,7 @@ ISR(WDT_vect, ISR_BLOCK)
/** Initializes the hardware and software associated with the V2 protocol command handling. */ /** Initializes the hardware and software associated with the V2 protocol command handling. */
void V2Protocol_Init(void) 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 */ /* Initialize the ADC converter for VTARGET level detection on supported AVR models */
ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128); ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128);
ADC_SetupChannel(VTARGET_ADC_CHANNEL); ADC_SetupChannel(VTARGET_ADC_CHANNEL);