Added board hardware driver support for the Arduino Uno development board.

Fixed incorrect LEDs_ChangeLEDs() function in the Benito board LED driver.

6 files changed, 141 insertions, 4 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index b10c225b0..1b90d827f 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -115,6 +115,9 @@
 
 			/** Selects the BUI specific board drivers, including the driver for the board LEDs. */
 			#define BOARD_BUI           17
+
+			/** Selects the Arduino Uno specific board drivers, including the driver for the board LEDs. */
+			#define BOARD_UNO           18
 			
 			#if !defined(__DOXYGEN__)
 				#define BOARD_          BOARD_NONE
diff --git a/LUFA/Drivers/Board/BENITO/LEDs.h b/LUFA/Drivers/Board/BENITO/LEDs.h
index a2e3c40ba..ff701985b 100644
--- a/LUFA/Drivers/Board/BENITO/LEDs.h
+++ b/LUFA/Drivers/Board/BENITO/LEDs.h
@@ -54,7 +54,7 @@
 	/* Includes: */
 		#include <avr/io.h>
 
-/* Enable C linkage for C++ Compilers: */
+	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
 			extern "C" {
 		#endif
@@ -104,7 +104,7 @@
 			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
 			                                   const uint8_t ActiveMask)
 			{
-				PORTC = ((PORTC | ActiveMask) & ~LEDMask);
+				PORTC = ((PORTC | LEDMask) & ~ActiveMask);
 			}
 
 			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 63c997b1b..94142e30c 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -120,9 +120,11 @@
 	#elif (BOARD == BOARD_USBFOO)
 		#include "USBFOO/LEDs.h"
 	#elif (BOARD == BOARD_UDIP)
-		#include "UDIP/LEDs.h"		
+		#include "UDIP/LEDs.h"
 	#elif (BOARD == BOARD_BUI)
-		#include "BUI/LEDs.h"		
+		#include "BUI/LEDs.h"
+	#elif (BOARD == BOARD_UNO)
+		#include "UNO/LEDs.h"
 	#elif (BOARD == BOARD_USER)
 		#include "Board/LEDs.h"
 	#endif
diff --git a/LUFA/Drivers/Board/UNO/LEDs.h b/LUFA/Drivers/Board/UNO/LEDs.h
new file mode 100644
index 000000000..dc6db25ea
--- /dev/null
+++ b/LUFA/Drivers/Board/UNO/LEDs.h
@@ -0,0 +1,129 @@
+/*

+             LUFA Library

+     Copyright (C) Dean Camera, 2010.

+              

+  dean [at] fourwalledcubicle [dot] com

+      www.fourwalledcubicle.com

+*/

+

+/*

+  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 Arduino Uno.

+ *

+ *  Board specific LED driver header for the Arduino Uno (http://arduino.cc/en/Main/ArduinoBoardUno).

+ *

+ *  \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_UNO UNO

+ *

+ *  Board specific LED driver header for the Arduino Uno (http://arduino.cc/en/Main/ArduinoBoardUno).

+ *

+ *  \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_BENITO_H__

+#define __LEDS_BENITO_H__

+

+	/* Includes: */

+		#include <avr/io.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 << 4)

+

+			/** LED mask for the second LED on the board. */

+			#define LEDS_LED2        (1 << 5)

+

+			/** LED mask for all the LEDs on the board. */

+			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)

+

+			/** LED mask for none of the board LEDs. */

+			#define LEDS_NO_LEDS     0

+

+		/* Inline Functions: */

+		#if !defined(__DOXYGEN__)

+			static inline void LEDs_Init(void)

+			{

+				DDRD  |= LEDS_ALL_LEDS;

+				PORTD |= LEDS_ALL_LEDS;

+			}

+			

+			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)

+			{

+				PORTD &= ~LEDMask;

+			}

+

+			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)

+			{

+				PORTD |= LEDMask;

+			}

+

+			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)

+			{

+				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);

+			}

+			

+			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,

+			                                   const uint8_t ActiveMask)

+			{

+				PORTD = ((PORTD | LEDMask) & ~ActiveMask);

+			}

+

+			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)

+			{

+				PORTD ^= LEDMask;

+			}

+			

+			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint8_t LEDs_GetLEDs(void)

+			{

+				return (PORTD & LEDS_ALL_LEDS);

+			}

+		#endif

+

+	/* Disable C linkage for C++ Compilers: */

+		#if defined(__cplusplus)

+			}

+		#endif

+		

+#endif

+

+/** @} */

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index c7b5fde90..cbedf1840 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -22,6 +22,7 @@
   *  - Added new project makefile template to the library and moved board driver stub files into in a new "CodeTemplates" directory
   *  - Added board hardware driver support for the Linnix UDIP development board
   *  - Added board hardware driver support for the Busware BUI development board
+  *  - Added board hardware driver support for the Arduino Uno development board
   *
   *  <b>Changed:</b>
   *  - Removed complicated logic for the Endpoint_ConfigureEndpoint() function to use inlined or function called versions
@@ -62,6 +63,7 @@
   *  - Fixed endpoint selection within the CALLBACK_HID_Device_CreateHIDReport() callback function causing broken GET REPORT requests
   *  - Fixed incorrect command name for EEPROM memory programming in the makefile dfu-ee target
   *  - Fixed BootloaderCDC project failing on some operating systems due to removed Line Encoding options (thanks to Alexey Belyaev)
+  *  - Fixed incorrect LEDs_ChangeLEDs() function in the Benito board LED driver
   *
   *  \section Sec_ChangeLog100807 Version 100807
   *  <b>New:</b>
diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index 4118f63cf..d267ccf90 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -40,6 +40,7 @@
  *   - Kernel Concepts USBFOO
  *   - Linnix UDIP
  *   - Busware BUI
+ *   - Arduino Uno
  *   - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
  */
  
\ No newline at end of file