Added board hardware driver support for the Adafruit U4 breakout board.

Fixed calculation of timer register reload values derived from F_CPU; must subtract one from the division result for the compare value to be correct.

Change AVRISP-MKII rescue clock speed to 4MHz to ensure that a 125KHz ISP speed works regardless of the target's fuses (i.e. DIV8 set).

Demos/Device/ClassDriver/AudioInput/AudioInput.c

@@ -132,7 +132,7 @@ void EVENT_USB_Device_Connect(void)
 
 	/* Sample reload timer initialization */
 	TIMSK0  = (1 << OCIE0A);
-	OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
+	OCR0A   = ((F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1);
 	TCCR0A  = (1 << WGM01);  // CTC mode
 	TCCR0B  = (1 << CS01);   // Fcpu/8 speed
 }

Demos/Device/ClassDriver/AudioOutput/AudioOutput.c

@@ -134,7 +134,7 @@ void EVENT_USB_Device_Connect(void)
 
 	/* Sample reload timer initialization */
 	TIMSK0  = (1 << OCIE0A);
-	OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
+	OCR0A   = ((F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1);
 	TCCR0A  = (1 << WGM01);  // CTC mode
 	TCCR0B  = (1 << CS01);   // Fcpu/8 speed
 

Demos/Device/LowLevel/AudioInput/AudioInput.c

@@ -86,7 +86,7 @@ void EVENT_USB_Device_Connect(void)
 
 	/* Sample reload timer initialization */
 	TIMSK0  = (1 << OCIE0A);
-	OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
+	OCR0A   = ((F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1);
 	TCCR0A  = (1 << WGM01);  // CTC mode
 	TCCR0B  = (1 << CS01);   // Fcpu/8 speed
 }

Demos/Device/LowLevel/AudioOutput/AudioOutput.c

@@ -80,7 +80,7 @@ void EVENT_USB_Device_Connect(void)
 
 	/* Sample reload timer initialization */
 	TIMSK0 = (1 << OCIE0A);
-	OCR0A  = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;
+	OCR0A  = ((F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1);
 	TCCR0A = (1 << WGM01);  // CTC mode
 	TCCR0B = (1 << CS01);   // Fcpu/8 speed
 

LUFA/Common/BoardTypes.h

@@ -131,6 +131,9 @@
 			/** Selects the Minimus specific board drivers, including the Button and LEDs drivers. */
 			#define BOARD_MINIMUS       22
 
+			/** Selects the Adafruit U4 specific board drivers, including the Button and LEDs drivers. */
+			#define BOARD_ADAFRUITU4    23
+
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
 

LUFA/Drivers/Board/ADAFRUITU4/LEDs.h

@@ -0,0 +1,129 @@
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *  \brief Board specific LED driver header for the Adafruit U4 Breakout board.
+ *
+ *  Board specific LED driver header for the Adafruit U4 Breakout board (http://ladyada.net/products/atmega32u4breakout).
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ */
+
+/** \ingroup Group_LEDs
+ *  @defgroup Group_LEDs_ADAFRUITU4 ADAFRUITU4
+ *
+ *  Board specific LED driver header for the Adafruit U4 Breakout board (http://ladyada.net/products/atmega32u4breakout).
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
+ *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
+ *
+ *  @{
+ */
+
+#ifndef __LEDS_ADAFRUITU4_H__
+#define __LEDS_ADAFRUITU4_H__
+
+	/* Includes: */
+		#include <avr/io.h>
+
+		#include "../../../Common/Common.h"
+
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_LEDS_H)
+			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
+		#endif
+
+	/* Public Interface - May be used in end-application: */
+		/* Macros: */
+			/** LED mask for the first LED on the board. */
+			#define LEDS_LED1        (1 << 6)
+
+			/** LED mask for all the LEDs on the board. */
+			#define LEDS_ALL_LEDS    LEDS_LED1
+
+			/** LED mask for the none of the board LEDs. */
+			#define LEDS_NO_LEDS     0
+
+		/* Inline Functions: */
+		#if !defined(__DOXYGEN__)
+			static inline void LEDs_Init(void)
+			{
+				DDRE  |=  LEDS_ALL_LEDS;
+				PORTE &= ~LEDS_ALL_LEDS;
+         	}
+
+			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
+			{
+				PORTE |= LEDMask;
+			}
+
+			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
+			{
+				PORTE &= ~LEDMask;
+			}
+
+			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
+			{
+				PORTE = ((PORTE & ~LEDS_ALL_LEDS) | LEDMask);
+			}
+
+			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
+			                                   const uint8_t ActiveMask)
+			{
+				PORTE = ((PORTE & ~LEDMask) | ActiveMask);
+			}
+
+			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
+			{
+				PORTE = (PORTE ^ (LEDMask & LEDS_ALL_LEDS));
+			}
+
+			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
+			static inline uint8_t LEDs_GetLEDs(void)
+			{
+				return (PORTE & LEDS_ALL_LEDS);
+			}
+		#endif
+
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
+#endif
+
+/** @} */
+

LUFA/Drivers/Board/LEDs.h

@@ -133,6 +133,8 @@
 		#include "MAXIMUS/LEDs.h"
 	#elif (BOARD == BOARD_MINIMUS)
 		#include "MINIMUS/LEDs.h"
+	#elif (BOARD == BOARD_ADAFRUITU4)
+		#include "ADAFRUITU4/LEDs.h"
 	#elif (BOARD == BOARD_USER)
 		#include "Board/LEDs.h"
 	#endif

LUFA/ManPages/ChangeLog.txt

@@ -27,6 +27,7 @@
   *  - Added board hardware driver support for the Blackcat USB JTAG board (thanks to the PSGroove team)
   *  - Added board hardware driver support for the Maximus board (thanks to the PSGroove team)
   *  - Added board hardware driver support for the Minimus board (thanks to the PSGroove team)
+  *  - Added board hardware driver support for the Adafruit U4 breakout board
   *  - Added default test tone generation mode to the Device mode AudioInput demos
   *  - Added new NO_CLASS_DRIVER_AUTOFLUSH compile time option to disable automatic flushing of interfaces when the USB management
   *    tasks for each driver is called

Projects/AVRISP-MKII/AVRISP-MKII.txt

@@ -105,9 +105,9 @@
  *   </tr>
  *  </table>
  *
- *  In addition, the AVR's OCR1A pin will generate a .5MHz clock, to act as an external rescue device clock
+ *  In addition, the AVR's OCR1A pin will generate a 4MHz clock, to act as an external rescue device clock if the
- *  if the fuses have been mis-set. To use the recovery clock, connect the OCR1A pin of the USB AVR to the target
+ *  fuses have been mis-set. To use the recovery clock, connect the OCR1A pin of the USB AVR to the target AVR's
- *  AVR's XTAL1 pin, and set the ISP programming speed to 125KHz (note: other ISP speeds will not work correctly).
+ *  XTAL1 pin, and set the ISP programming speed to 125KHz (note: other ISP speeds will not work correctly).
  *
  *  <b><sup>1</sup></b> <i>Optional, see \ref SSec_Options section - for USB AVRs with ADC modules only</i> \n
  *  <b><sup>2</sup></b> <i>See AUX line related tokens in the \ref SSec_Options section</i>

Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c

@@ -196,10 +196,10 @@ void ISPTarget_ConfigureRescueClock(void)
 	DDRB |= (1 << 5);
 	#endif
 
-	/* Start Timer 1 to generate a .5MHz clock on the OCR1A pin */
+	/* Start Timer 1 to generate a 4MHz clock on the OCR1A pin */
 	TIMSK1 = 0;
 	TCNT1  = 0;
-	OCR1A  = (F_CPU / 2 / 500000UL);
+	OCR1A  = ((F_CPU / 2 / 4000000UL) - 1);
 	TCCR1A = (1 << COM1A0);
 	TCCR1B = ((1 << WGM12) | (1 << CS10));
 }

Projects/AVRISP-MKII/Lib/V2Protocol.c

@@ -61,7 +61,7 @@ void V2Protocol_Init(void)
 	#endif
 
 	/* Timeout timer initialization (10ms period) */
-	OCR0A  = ((F_CPU / 1024) / 100);
+	OCR0A  = (((F_CPU / 1024) / 100) - 1);
 	TCCR0A = (1 << WGM01);
 	TIMSK0 = (1 << OCIE0A);
 

Projects/TempDataLogger/TempDataLogger.c

@@ -208,7 +208,7 @@ void SetupHardware(void)
 	TWI_Init();
 
 	/* 500ms logging interval timer configuration */
-	OCR1A   = ((F_CPU / 1024) / 2);
+	OCR1A   = (((F_CPU / 1024) / 2) - 1);
 	TCCR1B  = (1 << WGM12) | (1 << CS12) | (1 << CS10);
 	TIMSK1  = (1 << OCIE1A);
 

Projects/Webserver/Lib/uip/clock.c

@@ -19,7 +19,7 @@ ISR(TIMER1_COMPA_vect)
 //Initialise the clock
 void clock_init()
 {
-	OCR1A  = ((F_CPU / 1024) / 100);
+	OCR1A  = (((F_CPU / 1024) / 100) - 1);
 	TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
 	TIMSK1 = (1 << OCIE1A);
 }