Oops - make sure board driver dispatch headers test for the correct BOARD define values.

Add button support for the BENITO board target.

6 files changed, 113 insertions, 10 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index b162524ee..8e65c7ae7 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -101,7 +101,7 @@
 			/** Selects the USBTINY MKII specific board drivers, including the driver for the board LEDs. */

 			#define BOARD_USBTINYMKII   12

 			

-			/** Selects the Benito specific board drivers, including the driver for the board LEDs. */

+			/** Selects the Benito specific board drivers, including the Button and LEDs drivers. */

 			#define BOARD_BENITO        13

 			

 			/** Selects the JM-DB-U2 specific board drivers, including the Button and LEDs drivers. */

diff --git a/LUFA/Drivers/Board/BENITO/Buttons.h b/LUFA/Drivers/Board/BENITO/Buttons.h
new file mode 100644
index 000000000..828c23b4b
--- /dev/null
+++ b/LUFA/Drivers/Board/BENITO/Buttons.h
@@ -0,0 +1,102 @@
+/*

+             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 Buttons driver header for the BUMBLEB.

+ *

+ *  Board specific Buttons driver header for the BUMBLEB (http://fletchtronics.net/bumble-b).

+ *

+ *  The BUMBLEB third-party board does not include any on-board peripherals, but does have an officially recommended

+ *  external peripheral layout for buttons, LEDs and a Joystick.

+ *

+ *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver

+ *        dispatch header located in LUFA/Drivers/Board/Buttons.h.

+ */

+

+/** \ingroup Group_Buttons

+ *  @defgroup Group_Buttons_BUMBLEB BUMBLEB

+ *

+ *  Board specific buttons driver header for the BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB third-party

+ *  board does not include any on-board peripherals, but does have an officially recommended external peripheral layout

+ *  for buttons, LEDs and a Joystick.

+ *

+ *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver

+ *        dispatch header located in LUFA/Drivers/Board/Buttons.h.

+ *

+ *  @{

+ */

+

+#ifndef __BUTTONS_BUMBLEB_H__

+#define __BUTTONS_BUMBLEB_H__

+

+	/* Includes: */

+		#include <avr/io.h>

+		#include <stdbool.h>

+

+		#include "../../../Common/Common.h"

+

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

+		#if defined(__cplusplus)

+			extern "C" {

+		#endif

+

+	/* Preprocessor Checks: */

+		#if !defined(__INCLUDE_FROM_BUTTONS_H)

+			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.

+		#endif

+		

+	/* Public Interface - May be used in end-application: */

+		/* Macros: */

+			/** Button mask for the first button on the board. */

+			#define BUTTONS_BUTTON1      (1 << 7)

+	

+		/* Inline Functions: */

+		#if !defined(__DOXYGEN__)

+			static inline void Buttons_Init(void)

+			{

+				DDRD  &= ~BUTTONS_BUTTON1;

+				PORTD |=  BUTTONS_BUTTON1;

+			}

+

+			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;

+			static inline uint8_t Buttons_GetStatus(void)

+			{

+				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);

+			}

+		#endif

+

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

+		#if defined(__cplusplus)

+			}

+		#endif

+			

+#endif

+

+/** @} */

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index bfbf12a3b..af2b9386b 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -85,7 +85,9 @@
 		#include "BUMBLEB/Buttons.h"

 	#elif (BOARD == BOARD_EVK527)

 		#include "EVK527/Buttons.h"

-	#elif (BOARD == JMDBU2)

+	#elif (BOARD == BOARD_BENITO)

+		#include "BENITO/Buttons.h"

+	#elif (BOARD == BOARD_JMDBU2)

 		#include "JMDBU2/Buttons.h"

 	#elif (BOARD == BOARD_USER)

 		#include "Board/Buttons.h"

diff --git a/LUFA/Drivers/Board/JMDBU2/Buttons.h b/LUFA/Drivers/Board/JMDBU2/Buttons.h
index fd4be2596..28c6b8519 100644
--- a/LUFA/Drivers/Board/JMDBU2/Buttons.h
+++ b/LUFA/Drivers/Board/JMDBU2/Buttons.h
@@ -29,18 +29,18 @@
 */

 

 /** \file

- *  \brief Board specific Buttons driver header for the JM-DB-U2.

+ *  \brief Board specific Buttons driver header for the Bentio.

  *

- *  Board specific Buttons driver header for the JM-DB-U2 (http://u2.mattair.net/index.html).

+ *  Board specific Buttons driver header for the Benito (http://dorkbotpdx.org/wiki/benito).

  *

  *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver

  *        dispatch header located in LUFA/Drivers/Board/Buttons.h.

  */

  

 /** \ingroup Group_Buttons

- *  @defgroup Group_Buttons_JMDBU2 JMDBU2

+ *  @defgroup Group_Buttons_BENITO BENITO

  *

- *  Board specific Buttons driver header for the JM-DB-U2 (http://u2.mattair.net/index.html).

+ *  Board specific Buttons driver header for the Bentio (http://dorkbotpdx.org/wiki/benito).

  *

  *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver

  *        dispatch header located in LUFA/Drivers/Board/Buttons.h.

@@ -48,8 +48,8 @@
  *  @{

  */

 

-#ifndef __BUTTONS_JMDBU2_H__

-#define __BUTTONS_JMDBU2_H__

+#ifndef __BUTTONS_BENTIO_H__

+#define __BUTTONS_BENITO_H__

 

 	/* Includes: */

 		#include <avr/io.h>

diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index da97fed81..c44612522 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -109,7 +109,7 @@
 		#include "USBTINYMKII/LEDs.h"

 	#elif (BOARD == BOARD_BENITO)

 		#include "BENITO/LEDs.h"

-	#elif (BOARD == JMDBU2)

+	#elif (BOARD == BOARD_JMDBU2)

 		#include "JMDBU2/LEDs.h"

 	#elif (BOARD == BOARD_USER)

 		#include "Board/LEDs.h"

diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt
index 0c8eca39c..a6060311d 100644
--- a/LUFA/ManPages/LUFAPoweredProjects.txt
+++ b/LUFA/ManPages/LUFAPoweredProjects.txt
@@ -27,7 +27,6 @@
  *  - Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html

  *  - U2DIL/U4DIL, a set of DIP layout USB AVR boards: http://www.reworld.eu/re/en/products/u2dil/

  *  - USB10 AKA "The Ferret", a AT90USB162 development board: http://www.soc-machines.com

- *  - USBFoo, an AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102

  * 

  *  \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)

  *