From 938f86d06321c1a29cf87201000a9dae4e5a7c25 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 7 May 2009 06:33:07 +0000
Subject: [PATCH] Fix build errors in Joystick device demo and library LEDs
driver (on *nix systems).
---
Demos/Device/Joystick/Joystick.c | 1 +
LUFA/Drivers/Board/Buttons.h | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c
index cf136d076e..e1faeede71 100644
--- 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)
{
static uint8_t PrevJoyStatus = 0;
+ static uint8_t PrevButtonStatus = 0;
uint8_t JoyStatus_LCL = Joystick_GetStatus();
uint8_t ButtonStatus_LCL = Buttons_GetStatus();
bool InputChanged = false;
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 46d147345c..1ea3668cb8 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -71,15 +71,15 @@
#if !defined(BOARD)
#error BOARD must be set in makefile to a value specified in BoardTypes.h.
#elif (BOARD == BOARD_USBKEY)
- #include "USBKEY/BUTTONS.h"
+ #include "USBKEY/Buttons.h"
#elif (BOARD == BOARD_STK525)
- #include "STK525/BUTTONS.h"
+ #include "STK525/Buttons.h"
#elif (BOARD == BOARD_STK526)
- #include "STK526/BUTTONS.h"
+ #include "STK526/Buttons.h"
#elif (BOARD == BOARD_ATAVRUSBRF01)
- #include "ATAVRUSBRF01/BUTTONS.h"
+ #include "ATAVRUSBRF01/Buttons.h"
#elif (BOARD == BOARD_USER)
- #include "Board/BUTTONS.h"
+ #include "Board/Buttons.h"
#else
#error The selected board does not contain any GPIO buttons.
#endif