repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates
[mTask.git]
/
client
/
main.c
diff --git
a/client/main.c
b/client/main.c
index
f86beff
..
a7d6098
100644
(file)
--- a/
client/main.c
+++ b/
client/main.c
@@
-74,17
+74,19
@@
void loop(void)
// debug("Task %d not implemented\n", ct);
continue;
}
// debug("Task %d not implemented\n", ct);
continue;
}
- //Onshot task
- if(curtask->interval == 0){
- run_task(curtask);
- curtask->used = false;
- //Interrupt task
- } else if(curtask->interval & 32768){
+ //interrupt task
+ if(is_interrupt_task(curtask) && had_interrupt(curtask)){
debug("Interrupt task %d not implemented", ct);
debug("Interrupt task %d not implemented", ct);
- //Interval task, check if interval is passed
+ run_task(curtask);
+ //Interval task, and interval passed
} else if(cyclestart-curtask->lastrun > curtask->interval){
debug("Running interval task: %d", ct);
run_task(curtask);
} else if(cyclestart-curtask->lastrun > curtask->interval){
debug("Running interval task: %d", ct);
run_task(curtask);
+
+ //Oneshot task, thus disable
+ if(curtask->interval == 0){
+ curtask->used = false;
+ }
curtask->lastrun = cyclestart;
}
}
curtask->lastrun = cyclestart;
}
}
@@
-106,7
+108,7
@@
int main(int argc, char *argv[]){
while(true){
//Check for newetasks
loop();
while(true){
//Check for newetasks
loop();
- delay(
5
0);
+ delay(
10
0);
}
return 0;
}
}
return 0;
}