Fix errors in the new Micropendous board drivers. Reorder the board definition macro indexes so that misspelled board names default to BOARD_USER rather then BOARD_USBKEY.

4 files changed, 37 insertions, 27 deletions

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index ad34d513e..21f1b113d 100644
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -58,43 +58,43 @@
 
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
+			/** Selects the user-defined board drivers, which should be placed in the user project's folder
+			 *  under a directory named \c /Board/. Each board driver should be named identically to the LUFA
+			 *  master board driver (i.e., driver in the \c LUFA/Drivers/Board directory) so that the library
+			 *  can correctly identify it.
+			 */
+			#define BOARD_USER                 0
+
+			/** Disables board drivers when operation will not be adversely affected (e.g. LEDs) - use of board drivers
+			 *  such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */
+			#define BOARD_NONE                 1
+
 			/** Selects the USBKEY specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_USBKEY               0
+			#define BOARD_USBKEY               2
 
 			/** Selects the STK525 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_STK525               1
+			#define BOARD_STK525               3
 
 			/** Selects the STK526 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_STK526               2
+			#define BOARD_STK526               4
 
 			/** Selects the RZUSBSTICK specific board drivers, including the driver for the boards LEDs. */
-			#define BOARD_RZUSBSTICK           3
+			#define BOARD_RZUSBSTICK           5
 
 			/** Selects the ATAVRUSBRF01 specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_ATAVRUSBRF01         4
-
-			/** Selects the user-defined board drivers, which should be placed in the user project's folder
-			 *  under a directory named \c /Board/. Each board driver should be named identically to the LUFA
-			 *  master board driver (i.e., driver in the \c LUFA/Drivers/Board directory) so that the library
-			 *  can correctly identify it.
-			 */
-			#define BOARD_USER                 5
+			#define BOARD_ATAVRUSBRF01         6
 
 			/** Selects the BUMBLEB specific board drivers, using the officially recommended peripheral layout. */
-			#define BOARD_BUMBLEB              6
+			#define BOARD_BUMBLEB              7
 
 			/** Selects the XPLAIN (Revision 2 or newer) specific board drivers, including LED and Dataflash drivers. */
-			#define BOARD_XPLAIN               7
+			#define BOARD_XPLAIN               8
 
 			/** Selects the XPLAIN (Revision 1) specific board drivers, including LED and Dataflash drivers. */
-			#define BOARD_XPLAIN_REV1          8
+			#define BOARD_XPLAIN_REV1          9
 
 			/** Selects the EVK527 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_EVK527               9
-
-			/** Disables board drivers when operation will not be adversely affected (e.g. LEDs) - use of board drivers
-			 *  such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */
-			#define BOARD_NONE                 10
+			#define BOARD_EVK527               10
 
 			/** Selects the Teensy version 1.x specific board drivers, including the driver for the board LEDs. */
 			#define BOARD_TEENSY               11
diff --git a/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h b/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
index 640568dc5..10f8893f7 100644
--- a/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
@@ -72,6 +72,13 @@
  */

 

 /** \ingroup Group_Buttons

+ *  \defgroup Group_Buttons_MICROPENDOUS_DIP MICROPENDOUS_DIP

+ *  \brief Board specific Button driver header for the Micropendous DIP (https://code.google.com/p/micropendous/wiki/MicropendousDIP).

+ *

+ *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.

+ */

+

+/** \ingroup Group_Buttons

  *  \defgroup Group_Buttons_MICROPENDOUS_32U2 MICROPENDOUS_32U2

  *  \brief Board specific Buttons driver header for the Micropendous 32U2.

  *

@@ -118,20 +125,23 @@
 		#elif (BOARD == BOARD_MICROPENDOUS_4)

 			#define _BOARD_BUTTON1_MASK             (1 << 2)

 			#define _BOARD_BUTTON_PORTLETTER        E

+		#elif (BOARD == BOARD_MICROPENDOUS_DIP)

+			#define _BOARD_BUTTON1_MASK             (1 << 2)

+			#define _BOARD_BUTTON_PORTLETTER        E

 		#endif

 		

 		#define _BOARD_BUTTON_CONCAT2(Reg, Letter)  Reg ## Letter

 		#define _BOARD_BUTTON_CONCAT(Reg, Letter)   _BOARD_BUTTON_CONCAT2(Reg, Letter)

 

 		#define _BOARD_BUTTON_PORT                 _BOARD_BUTTON_CONCAT(PORT, _BOARD_BUTTON_PORTLETTER)

-		#define _BOARD_BUTTON_PIN                  _BOARD_BUTTON_CONCAT(PIN, _BOARD_BUTTON_PORTLETTER)

-		#define _BOARD_BUTTON_DDR                  _BOARD_BUTTON_CONCAT(DDR, _BOARD_BUTTON_PORTLETTER)

+		#define _BOARD_BUTTON_PIN                  _BOARD_BUTTON_CONCAT(PIN,  _BOARD_BUTTON_PORTLETTER)

+		#define _BOARD_BUTTON_DDR                  _BOARD_BUTTON_CONCAT(DDR,  _BOARD_BUTTON_PORTLETTER)

 	#endif

 

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

 		/* Macros: */

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

-			#define BUTTONS_BUTTON1      _BOARD_BUTTON1_MASK

+			#define BUTTONS_BUTTON1                _BOARD_BUTTON1_MASK

 

 		/* Inline Functions: */

 		#if !defined(__DOXYGEN__)

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 8fe8ebcc0..55e54c5bc 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -135,9 +135,9 @@
 			#include "XMEGA/A3BU_XPLAINED/Buttons.h"
 		#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3))
 			#include "AVR8/USB2AX/Buttons.h"
-		#elif ((BOARD_MICROPENDOUS_32U2) || (BOARD == BOARD_MICROPENDOUS_A) || \
-		       (BOARD == BOARD_MICROPENDOUS_1) || (BOARD == BOARD_MICROPENDOUS_2) || \
-		       (BOARD == BOARD_MICROPENDOUS_3) || (BOARD == BOARD_MICROPENDOUS_4) || \
+		#elif ((BOARD == BOARD_MICROPENDOUS_32U2) || (BOARD == BOARD_MICROPENDOUS_A) || \
+		       (BOARD == BOARD_MICROPENDOUS_1)    || (BOARD == BOARD_MICROPENDOUS_2) || \
+		       (BOARD == BOARD_MICROPENDOUS_3)    || (BOARD == BOARD_MICROPENDOUS_4) || \
 		       (BOARD == BOARD_MICROPENDOUS_DIP))
 			#include "AVR8/MICROPENDOUS/Buttons.h"
 		#else
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 9db695798..b89cffee5 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -175,7 +175,7 @@
 			#include "XMEGA/A3BU_XPLAINED/LEDs.h"
 		#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3))
 			#include "AVR8/USB2AX/LEDs.h"
-		#elif (BOARD_MICROPENDOUS_32U2)
+		#elif (BOARD == BOARD_MICROPENDOUS_32U2)
 			#include "AVR8/MICROPENDOUS/LEDs.h"
 		#else
 			#include "Board/LEDs.h"