From 63a8f66d92b5d7018a4d962f4f7b23774a621771 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Wed, 6 May 2009 07:50:34 +0000
Subject: Changed HWB board driver to Buttons driver, to allow for the support
 of future boards with more than one mounted GPIO button.

---
 Demos/OTG/TestApp/TestApp.c | 14 +++++++-------
 Demos/OTG/TestApp/TestApp.h |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Demos/OTG/TestApp')

diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index 8c8a23ffc..4dc9b44e3 100644
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -40,7 +40,7 @@
 TASK_LIST
 {
 	{ .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN  },
-	{ .Task = TestApp_CheckHWB     , .TaskStatus = TASK_RUN  },
+	{ .Task = TestApp_CheckButton  , .TaskStatus = TASK_RUN  },
 	{ .Task = TestApp_CheckTemp    , .TaskStatus = TASK_RUN  },
 	{ .Task = USB_USBTask          , .TaskStatus = TASK_RUN  },
 };
@@ -63,7 +63,7 @@ int main(void)
 	Temperature_Init();
 	Joystick_Init();
 	LEDs_Init();
-	HWB_Init();
+	Buttons_Init();
 	
 	/* Millisecond timer initialization, with output compare interrupt enabled */
 	OCR0A  = 0x7D;
@@ -137,17 +137,17 @@ TASK(TestApp_CheckTemp)
 	}	
 }
 
-/** Task responsible for checking the HWB button position, and start-stopping other tasks and the USB
+/** Task responsible for checking the board's first button' position, and start-stopping other tasks and the USB
  *  interface in response to user joystick movements.
  */
-TASK(TestApp_CheckHWB)
+TASK(TestApp_CheckButton)
 {
 	static SchedulerDelayCounter_t DelayCounter = 0;
 	static bool                    IsPressed;
 	static bool                    BlockingJoystickTask;
 	
-	/* Check if HWB pressed (start USB) */
-	if (HWB_GetStatus() == true)
+	/* Check if board button pressed (start USB) */
+	if (Buttons_GetStatus() & BUTTONS_BUTTON1)
 	{
 		/* Debounce - check 100 ticks later to see if button is still being pressed */
 		if ((IsPressed == false) && (Scheduler_HasDelayElapsed(100, &DelayCounter)))
@@ -185,7 +185,7 @@ TASK(TestApp_CheckHWB)
 	}
     else
     {
-		/* HWB not pressed - reset debounce interval counter and press handled flag */
+		/* Board button not pressed - reset debounce interval counter and press handled flag */
 		Scheduler_ResetDelay(&DelayCounter);
 		IsPressed = false;
 	}
diff --git a/Demos/OTG/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h
index d5ce8dd3a..de4d52612 100644
--- a/Demos/OTG/TestApp/TestApp.h
+++ b/Demos/OTG/TestApp/TestApp.h
@@ -51,12 +51,12 @@
 		#include <LUFA/Drivers/Peripheral/SerialStream.h>       // USART Stream driver
 		#include <LUFA/Drivers/Board/Joystick.h>                // Joystick driver
 		#include <LUFA/Drivers/Board/LEDs.h>                    // LED driver
-		#include <LUFA/Drivers/Board/HWB.h>                     // Hardware Button driver
+		#include <LUFA/Drivers/Board/Buttons.h>                 // Board Buttons driver
 		#include <LUFA/Drivers/Board/Temperature.h>             // Temperature sensor driver
 		
 	/* Task Definitions: */
 		TASK(TestApp_CheckJoystick);
-		TASK(TestApp_CheckHWB);
+		TASK(TestApp_CheckButton);
 		TASK(TestApp_CheckTemp);
 
 #endif
-- 
cgit v1.2.3