repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
[mTask.git]
/
client
/
client.c
diff --git
a/client/client.c
b/client/client.c
index
0218fb7
..
59c611f
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-63,6
+63,8
@@
void read_message(void)
default:
debug("Unknown message: %X", c);
}
default:
debug("Unknown message: %X", c);
}
+ } else {
+// debug("No input");
}
}
}
}
@@
-73,36
+75,32
@@
void loop(void)
if(getmillis()-loopmillis < LOOPDELAY){
return;
}
if(getmillis()-loopmillis < LOOPDELAY){
return;
}
+ loopmillis = getmillis();
#endif
#endif
+ debug("Loop");
-
int c
t;
+
struct task *
t;
long cyclestart;
long cyclestart;
- struct task *curtask;
read_message();
//Run tasks
cyclestart = getmillis();
read_message();
//Run tasks
cyclestart = getmillis();
- for(ct = 0; ct<MAXTASKS; ct++){
- //See whether the task is even in use
- if((curtask = task_get(ct)) == NULL){
-// debug("Task %d not implemented\n", ct);
- continue;
- }
+ for(struct task *t = task_head(); t != NULL; t = task_next(t)){
//interrupt task
//interrupt task
- if(is_interrupt_task(
curtask) && had_interrupt(curtask
)){
- debug("Interrupt task %d not implemented",
ct
);
- run_task(
curtask
);
+ if(is_interrupt_task(
t) && had_interrupt(t
)){
+ debug("Interrupt task %d not implemented",
t->taskid
);
+ run_task(
t
);
//Interval task, and interval passed
//Interval task, and interval passed
- } else if(cyclestart-
curtask->lastrun > curtask
->interval){
- debug("Running interval task: %d",
ct
);
- run_task(
curtask
);
+ } else if(cyclestart-
t->lastrun > t
->interval){
+ debug("Running interval task: %d",
t->taskid
);
+ run_task(
t
);
//Oneshot task, thus disable
//Oneshot task, thus disable
-
if(curtask
->interval == 0){
-
curtask->used = false;
-
}
-
curtask
->lastrun = cyclestart;
+
// if(t
->interval == 0){
+
//
curtask->used = false;
+
//
}
+
t
->lastrun = cyclestart;
}
}
}
}
}
}