Fix build errors in Joystick device demo and library LEDs driver (on *nix systems).

diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c
index cf136d0..e1faeed 100644 (file)
--- a/Demos/Device/Joystick/Joystick.c
+++ b/Demos/Device/Joystick/Joystick.c
@@ -154,6 +154,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 bool GetNextReport(USB_JoystickReport_Data_t* ReportData)\r
 {\r
        static uint8_t PrevJoyStatus    = 0;\r
 bool GetNextReport(USB_JoystickReport_Data_t* ReportData)\r
 {\r
        static uint8_t PrevJoyStatus    = 0;\r

+       static uint8_t PrevButtonStatus = 0;\r

        uint8_t        JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t        ButtonStatus_LCL = Buttons_GetStatus();\r
        bool           InputChanged     = false;\r
        uint8_t        JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t        ButtonStatus_LCL = Buttons_GetStatus();\r
        bool           InputChanged     = false;\r

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 46d1473..1ea3668 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -71,15 +71,15 @@
        #if !defined(BOARD)\r
                #error BOARD must be set in makefile to a value specified in BoardTypes.h.\r
        #elif (BOARD == BOARD_USBKEY)\r
        #if !defined(BOARD)\r
                #error BOARD must be set in makefile to a value specified in BoardTypes.h.\r
        #elif (BOARD == BOARD_USBKEY)\r

-               #include "USBKEY/BUTTONS.h"\r
+               #include "USBKEY/Buttons.h"\r

        #elif (BOARD == BOARD_STK525)\r
        #elif (BOARD == BOARD_STK525)\r

-               #include "STK525/BUTTONS.h"\r
+               #include "STK525/Buttons.h"\r

        #elif (BOARD == BOARD_STK526)\r
        #elif (BOARD == BOARD_STK526)\r

-               #include "STK526/BUTTONS.h"\r
+               #include "STK526/Buttons.h"\r

        #elif (BOARD == BOARD_ATAVRUSBRF01)\r
        #elif (BOARD == BOARD_ATAVRUSBRF01)\r

-               #include "ATAVRUSBRF01/BUTTONS.h"\r
+               #include "ATAVRUSBRF01/Buttons.h"\r

        #elif (BOARD == BOARD_USER)\r
        #elif (BOARD == BOARD_USER)\r

-               #include "Board/BUTTONS.h"              \r
+               #include "Board/Buttons.h"              \r

        #else\r
                #error The selected board does not contain any GPIO buttons.\r
        #endif\r
        #else\r
                #error The selected board does not contain any GPIO buttons.\r
        #endif\r