Fix errors in the new Micropendous board drivers. Reorder the board definition macro...

[pub/lufa.git] / LUFA / Drivers / Board / AVR8 / MICROPENDOUS / Buttons.h

diff --git a/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h b/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
index 640568d..10f8893 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
@@ -72,6 +72,13 @@
  */\r
 \r
 /** \ingroup Group_Buttons\r
  */\r
 \r
 /** \ingroup Group_Buttons\r

+ *  \defgroup Group_Buttons_MICROPENDOUS_DIP MICROPENDOUS_DIP\r
+ *  \brief Board specific Button driver header for the Micropendous DIP (https://code.google.com/p/micropendous/wiki/MicropendousDIP).\r
+ *\r
+ *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.\r
+ */\r
+\r
+/** \ingroup Group_Buttons\r

  *  \defgroup Group_Buttons_MICROPENDOUS_32U2 MICROPENDOUS_32U2\r
  *  \brief Board specific Buttons driver header for the Micropendous 32U2.\r
  *\r
  *  \defgroup Group_Buttons_MICROPENDOUS_32U2 MICROPENDOUS_32U2\r
  *  \brief Board specific Buttons driver header for the Micropendous 32U2.\r
  *\r


@@ -118,20 +125,23 @@
                #elif (BOARD == BOARD_MICROPENDOUS_4)\r
                        #define _BOARD_BUTTON1_MASK             (1 << 2)\r
                        #define _BOARD_BUTTON_PORTLETTER        E\r
                #elif (BOARD == BOARD_MICROPENDOUS_4)\r
                        #define _BOARD_BUTTON1_MASK             (1 << 2)\r
                        #define _BOARD_BUTTON_PORTLETTER        E\r

+               #elif (BOARD == BOARD_MICROPENDOUS_DIP)\r
+                       #define _BOARD_BUTTON1_MASK             (1 << 2)\r
+                       #define _BOARD_BUTTON_PORTLETTER        E\r

                #endif\r
                \r
                #define _BOARD_BUTTON_CONCAT2(Reg, Letter)  Reg ## Letter\r
                #define _BOARD_BUTTON_CONCAT(Reg, Letter)   _BOARD_BUTTON_CONCAT2(Reg, Letter)\r
 \r
                #define _BOARD_BUTTON_PORT                 _BOARD_BUTTON_CONCAT(PORT, _BOARD_BUTTON_PORTLETTER)\r
                #endif\r
                \r
                #define _BOARD_BUTTON_CONCAT2(Reg, Letter)  Reg ## Letter\r
                #define _BOARD_BUTTON_CONCAT(Reg, Letter)   _BOARD_BUTTON_CONCAT2(Reg, Letter)\r
 \r
                #define _BOARD_BUTTON_PORT                 _BOARD_BUTTON_CONCAT(PORT, _BOARD_BUTTON_PORTLETTER)\r

-               #define _BOARD_BUTTON_PIN                  _BOARD_BUTTON_CONCAT(PIN, _BOARD_BUTTON_PORTLETTER)\r
-               #define _BOARD_BUTTON_DDR                  _BOARD_BUTTON_CONCAT(DDR, _BOARD_BUTTON_PORTLETTER)\r
+               #define _BOARD_BUTTON_PIN                  _BOARD_BUTTON_CONCAT(PIN,  _BOARD_BUTTON_PORTLETTER)\r
+               #define _BOARD_BUTTON_DDR                  _BOARD_BUTTON_CONCAT(DDR,  _BOARD_BUTTON_PORTLETTER)\r

        #endif\r
 \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Button mask for the first button on the board. */\r
        #endif\r
 \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Button mask for the first button on the board. */\r

-                       #define BUTTONS_BUTTON1      _BOARD_BUTTON1_MASK\r
+                       #define BUTTONS_BUTTON1                _BOARD_BUTTON1_MASK\r

 \r
                /* Inline Functions: */\r
                #if !defined(__DOXYGEN__)\r
 \r
                /* Inline Functions: */\r
                #if !defined(__DOXYGEN__)\r