X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=client%2Fmain.c;h=a7d60989dd3cd00964ec99667f48b2829d92c0b0;hb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;hp=f3dd06ad38897b5f1efa4f8cf46685599950e992;hpb=7df511557f1e750bac4b45847f65e1e51aabdf54;p=mTask.git

diff --git a/client/main.c b/client/main.c
index f3dd06a..a7d6098 100644
--- a/client/main.c
+++ b/client/main.c
@@ -74,21 +74,21 @@ void loop(void)
 //			debug("Task %d not implemented\n", ct);
 			continue;
 		}
-		//See whether the task interval has passed
-		if(cyclestart-curtask->lastrun < curtask->interval){
-//			debug("Task %d not scheduled\n", ct);
-			continue;
-		}
-		debug("Current task to run: %d", ct);
-		run_task(curtask);
-		curtask->lastrun = cyclestart;
-		if(curtask->interval == 0){
-			curtask->used = false;
-			write_byte('m');
-			write_byte('d');
-			write_byte('\n');
+		//interrupt task
+		if(is_interrupt_task(curtask) && had_interrupt(curtask)){
+			debug("Interrupt task %d not implemented", ct);
+			run_task(curtask);
+		//Interval task, and interval passed
+		} 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;
 		}
-		write_byte('\n');
 	}
 }
 
@@ -107,9 +107,8 @@ int main(int argc, char *argv[]){
 	debug("booting up");
 	while(true){
 		//Check for newetasks
-		write_byte('\n');
 		loop();
-		delay(50);
+		delay(100);
 	}
 	return 0;
 }