X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=client%2Fclient.c;h=59c611fd87f0a11d747549ab573771e2038923c5;hb=f39868397acdc4cdcb71b58926dee62327933336;hp=6502fb71453a4d600643c8b38322b8d9b0df1d82;hpb=39da74c72f4df302273fa2da5d23f3cc6e05d9fa;p=mTask.git

diff --git a/client/client.c b/client/client.c
index 6502fb7..59c611f 100644
--- a/client/client.c
+++ b/client/client.c
@@ -79,34 +79,28 @@ void loop(void)
 #endif
 	debug("Loop");
 
-	int ct;
+	struct task *t;
 	long cyclestart;
-	struct task *curtask;
 
 	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
-		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
-		} 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
-			if(curtask->interval == 0){
-				curtask->used = false;
-			}
-			curtask->lastrun = cyclestart;
+//			if(t->interval == 0){
+//				curtask->used = false;
+//			}
+			t->lastrun = cyclestart;
 		}
 	}
 }