projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed "Host_" section of the function names in ConfigDescriptor.h, as most of the...
[pub/USBasp.git]
/
Demos
/
OTG
/
TestApp
/
TestApp.c
diff --git
a/Demos/OTG/TestApp/TestApp.c
b/Demos/OTG/TestApp/TestApp.c
index
a66a728
..
d5a7523
100644
(file)
--- a/
Demos/OTG/TestApp/TestApp.c
+++ b/
Demos/OTG/TestApp/TestApp.c
@@
-36,12
+36,6
@@
\r
#include "TestApp.h"
\r
\r
\r
#include "TestApp.h"
\r
\r
-/* Project Tags, for reading out using the ButtLoad project */
\r
-BUTTLOADTAG(ProjName, "LUFA Test App");
\r
-BUTTLOADTAG(BuildTime, __TIME__);
\r
-BUTTLOADTAG(BuildDate, __DATE__);
\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);
\r
-
\r
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
@@
-80,7
+74,7
@@
int main(void)
/* Turn on interrupts */
\r
sei();
\r
\r
/* Turn on interrupts */
\r
sei();
\r
\r
- /* Startup message via USART */
\r
+ /* Start
-
up message via USART */
\r
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
\r
"LUFA Demo running.\r\n" ESC_INVERSE_OFF));
\r
\r
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
\r
"LUFA Demo running.\r\n" ESC_INVERSE_OFF));
\r
\r
@@
-130,13
+124,13
@@
TASK(TestApp_CheckJoystick)
*/
\r
TASK(TestApp_CheckTemp)
\r
{
\r
*/
\r
TASK(TestApp_CheckTemp)
\r
{
\r
- static SchedulerDelayCounter_t DelayCounter = 10000; // Force immediate run on startup
\r
+ static SchedulerDelayCounter_t DelayCounter = 10000; // Force immediate run on start
-
up
\r
\r
/* Task runs every 10000 ticks, 10 seconds for this demo */
\r
if (Scheduler_HasDelayElapsed(10000, &DelayCounter))
\r
{
\r
printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"),
\r
\r
/* Task runs every 10000 ticks, 10 seconds for this demo */
\r
if (Scheduler_HasDelayElapsed(10000, &DelayCounter))
\r
{
\r
printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"),
\r
- (int)Temperature_GetTemperature());
\r
+ (int
8_t
)Temperature_GetTemperature());
\r
\r
/* Reset the delay counter, ready to count another 10000 tick interval */
\r
Scheduler_ResetDelay(&DelayCounter);
\r
\r
/* Reset the delay counter, ready to count another 10000 tick interval */
\r
Scheduler_ResetDelay(&DelayCounter);
\r
@@
-161,7
+155,7
@@
TASK(TestApp_CheckHWB)
/* Set flag, indicating that current pressed state has been handled */
\r
IsPressed = true;
\r
\r
/* Set flag, indicating that current pressed state has been handled */
\r
IsPressed = true;
\r
\r
- /* First start of the USB interface perm
ena
ntly blocks the joystick task */
\r
+ /* First start of the USB interface perm
ane
ntly blocks the joystick task */
\r
if (BlockingJoystickTask == false)
\r
{
\r
Scheduler_SetTaskMode(TestApp_CheckJoystick, TASK_STOP);
\r
if (BlockingJoystickTask == false)
\r
{
\r
Scheduler_SetTaskMode(TestApp_CheckJoystick, TASK_STOP);
\r