Added support for the JM-DB-U2 board hardware.

7 files changed, 234 insertions, 3 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index e1988e7b9..b162524ee 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -103,6 +103,9 @@
 			

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

 			#define BOARD_BENITO        13

+			

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

+			#define BOARD_JMDBU2        14

 

 			#if !defined(__DOXYGEN__)

 				#define BOARD_          BOARD_NONE

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 40ed384a7..bfbf12a3b 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -85,6 +85,8 @@
 		#include "BUMBLEB/Buttons.h"

 	#elif (BOARD == BOARD_EVK527)

 		#include "EVK527/Buttons.h"

+	#elif (BOARD == JMDBU2)

+		#include "JMDBU2/Buttons.h"

 	#elif (BOARD == BOARD_USER)

 		#include "Board/Buttons.h"

 	#else

diff --git a/LUFA/Drivers/Board/JMDBU2/Buttons.h b/LUFA/Drivers/Board/JMDBU2/Buttons.h
new file mode 100644
index 000000000..fd4be2596
--- /dev/null
+++ b/LUFA/Drivers/Board/JMDBU2/Buttons.h
@@ -0,0 +1,97 @@
+/*

+             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 JM-DB-U2.

+ *

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

+ *

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

+ *

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

+ *

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

+#define __BUTTONS_JMDBU2_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/JMDBU2/LEDs.h b/LUFA/Drivers/Board/JMDBU2/LEDs.h
new file mode 100644
index 000000000..7061c091b
--- /dev/null
+++ b/LUFA/Drivers/Board/JMDBU2/LEDs.h
@@ -0,0 +1,127 @@
+/*

+             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 JM-DB-U2.

+ *

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

+ *

+ *  \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_JMDBU2 JMDBU2

+ *

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

+ *

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

+#define __LEDS_JMDBU2_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 << 4)

+

+			/** 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)

+			{

+				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 = (PORTD ^ (LEDMask & LEDS_ALL_LEDS));

+			}

+			

+			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/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 884aa7dab..da97fed81 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -109,6 +109,8 @@
 		#include "USBTINYMKII/LEDs.h"

 	#elif (BOARD == BOARD_BENITO)

 		#include "BENITO/LEDs.h"

+	#elif (BOARD == JMDBU2)

+		#include "JMDBU2/LEDs.h"

 	#elif (BOARD == BOARD_USER)

 		#include "Board/LEDs.h"

 	#endif

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 0dd049761..370963e6e 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -10,10 +10,8 @@
   *

   *  <b>New:</b>

   *  - Added incomplete MIDIToneGenerator project

-  *  - Added board hardware driver support for the PJRC Teensy line of USB AVR boards

   *  - Added new Relay Controller Board project (thanks to OBinou)

-  *  - Added board hardware driver support for Tom's USBTINY MKII programmer

-  *  - Added board hardware driver support for the Benito programmer

+  *  - Added board hardware driver support for the Teensy, USBTINY MKII, Benito and JM-DB-U2 lines of third party USB AVR boards

   *

   *  <b>Changed:</b>

   *  - AVRISP programmer project now has a more robust timeout system, allowing for an increase of the software USART speed

diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt
index cf9f53709..c16def7b4 100644
--- a/LUFA/ManPages/DeviceSupport.txt
+++ b/LUFA/ManPages/DeviceSupport.txt
@@ -32,6 +32,8 @@
  *

  *  Currently supported third-party boards (see \ref Group_BoardTypes):

  *   - Bumble-B (using officially recommended peripheral layout)

+ *   - Benito

+ *   - JM-DB-U2

  *   - Teensy (all revisions and versions)

  *   - USBTINY MKII (all revisions and versions)

  *   - Any Other Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)