X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1c16ae399a9f924c15d9dec54cacb1320ff0a92f..526e398986583e2fb65c0a36a2fbf2ce153446e5:/Demos/OTG/TestApp/TestApp.c

diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index d5a752322..4dc9b44e3 100644
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -39,10 +39,10 @@
 /* Scheduler Task List */
 TASK_LIST
 {
-	{ Task: TestApp_CheckJoystick, TaskStatus: TASK_RUN  },
-	{ Task: TestApp_CheckHWB     , TaskStatus: TASK_RUN  },
-	{ Task: TestApp_CheckTemp    , TaskStatus: TASK_RUN  },
-	{ Task: USB_USBTask          , TaskStatus: TASK_RUN  },
+	{ .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN  },
+	{ .Task = TestApp_CheckButton  , .TaskStatus = TASK_RUN  },
+	{ .Task = TestApp_CheckTemp    , .TaskStatus = TASK_RUN  },
+	{ .Task = USB_USBTask          , .TaskStatus = TASK_RUN  },
 };
 
 /** Main program entry point. This routine configures the hardware required by the application, then
@@ -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;
 	}