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

diff --git a/client/main.c b/client/main.c
index dc43de2..1818238 100644
--- a/client/main.c
+++ b/client/main.c
@@ -55,9 +55,6 @@ void read_message(void)
 		default:
 			debug("Unknown message: %X", c);
 		}
-	} else {
-		delay(1000);
-		printf("no input...\n");
 	}
 }
 
@@ -77,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');
 	}
 }
 
@@ -110,7 +107,6 @@ int main(int argc, char *argv[]){
 	debug("booting up");
 	while(true){
 		//Check for newetasks
-		write_byte('\n');
 		loop();
 		delay(50);
 	}