X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ed031c1df2f5b053b9cd9f48c63e66a42b7c049e..ba7cd3f22e0ec8c2fc7fd5dae3620aa75d926fd3:/Demos/OTG/TestApp/TestApp.c diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c index a66a728c9..8c8a23ffc 100644 --- a/Demos/OTG/TestApp/TestApp.c +++ b/Demos/OTG/TestApp/TestApp.c @@ -36,19 +36,13 @@ #include "TestApp.h" -/* Project Tags, for reading out using the ButtLoad project */ -BUTTLOADTAG(ProjName, "LUFA Test App"); -BUTTLOADTAG(BuildTime, __TIME__); -BUTTLOADTAG(BuildDate, __DATE__); -BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING); - /* 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_CheckHWB , .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 @@ -80,7 +74,7 @@ int main(void) /* Turn on interrupts */ sei(); - /* Startup message via USART */ + /* Start-up message via USART */ puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY "LUFA Demo running.\r\n" ESC_INVERSE_OFF)); @@ -130,13 +124,13 @@ TASK(TestApp_CheckJoystick) */ TASK(TestApp_CheckTemp) { - static SchedulerDelayCounter_t DelayCounter = 10000; // Force immediate run on startup + static SchedulerDelayCounter_t DelayCounter = 10000; // Force immediate run on start-up /* Task runs every 10000 ticks, 10 seconds for this demo */ if (Scheduler_HasDelayElapsed(10000, &DelayCounter)) { printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"), - (int)Temperature_GetTemperature()); + (int8_t)Temperature_GetTemperature()); /* Reset the delay counter, ready to count another 10000 tick interval */ Scheduler_ResetDelay(&DelayCounter); @@ -161,7 +155,7 @@ TASK(TestApp_CheckHWB) /* Set flag, indicating that current pressed state has been handled */ IsPressed = true; - /* First start of the USB interface permenantly blocks the joystick task */ + /* First start of the USB interface permanently blocks the joystick task */ if (BlockingJoystickTask == false) { Scheduler_SetTaskMode(TestApp_CheckJoystick, TASK_STOP);