X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=client%2Fmain.c;h=18182389236e0ba2a4757b3b710c0d20324d6a03;hb=c3bb3dde2bb886a9f86f9de5f4f96beb8d86b53d;hp=f86beff79013463844d7bf19323c6c676559f389;hpb=acd239b3f29e215ade0b63d5b26b6cf8e8ae0d63;p=mTask.git

diff --git a/client/main.c b/client/main.c
index f86beff..1818238 100644
--- a/client/main.c
+++ b/client/main.c
@@ -74,17 +74,19 @@ void loop(void)
 //			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);
-		//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);
+
+			//Oneshot task, thus disable
+			if(curtask->interval == 0){
+				curtask->used = false;
+			}
 			curtask->lastrun = cyclestart;
 		}
 	}