Removed all user pipe/endpoint interrupt APIs, added internal library support for...

[pub/USBasp.git] / Demos / OTG / TestApp / TestApp.c

diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index d5a7523..4dc9b44 100644 (file)
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -39,10 +39,10 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
-       { Task: TestApp_CheckJoystick, TaskStatus: TASK_RUN  },\r
-       { Task: TestApp_CheckHWB     , TaskStatus: TASK_RUN  },\r
-       { Task: TestApp_CheckTemp    , TaskStatus: TASK_RUN  },\r
-       { Task: USB_USBTask          , TaskStatus: TASK_RUN  },\r
+       { .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN  },\r
+       { .Task = TestApp_CheckButton  , .TaskStatus = TASK_RUN  },\r
+       { .Task = TestApp_CheckTemp    , .TaskStatus = TASK_RUN  },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_RUN  },\r
 };\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
@@ -63,7 +63,7 @@ int main(void)
        Temperature_Init();\r
        Joystick_Init();\r
        LEDs_Init();\r
-       HWB_Init();\r
+       Buttons_Init();\r
        \r
        /* Millisecond timer initialization, with output compare interrupt enabled */\r
        OCR0A  = 0x7D;\r
@@ -137,17 +137,17 @@ TASK(TestApp_CheckTemp)
        }       \r
 }\r
 \r
-/** Task responsible for checking the HWB button position, and start-stopping other tasks and the USB\r
+/** Task responsible for checking the board's first button' position, and start-stopping other tasks and the USB\r
  *  interface in response to user joystick movements.\r
  */\r
-TASK(TestApp_CheckHWB)\r
+TASK(TestApp_CheckButton)\r
 {\r
        static SchedulerDelayCounter_t DelayCounter = 0;\r
        static bool                    IsPressed;\r
        static bool                    BlockingJoystickTask;\r
        \r
-       /* Check if HWB pressed (start USB) */\r
-       if (HWB_GetStatus() == true)\r
+       /* Check if board button pressed (start USB) */\r
+       if (Buttons_GetStatus() & BUTTONS_BUTTON1)\r
        {\r
                /* Debounce - check 100 ticks later to see if button is still being pressed */\r
                if ((IsPressed == false) && (Scheduler_HasDelayElapsed(100, &DelayCounter)))\r
@@ -185,7 +185,7 @@ TASK(TestApp_CheckHWB)
        }\r
     else\r
     {\r
-               /* HWB not pressed - reset debounce interval counter and press handled flag */\r
+               /* Board button not pressed - reset debounce interval counter and press handled flag */\r
                Scheduler_ResetDelay(&DelayCounter);\r
                IsPressed = false;\r
        }\r