X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2FMarster.java;h=81ee5f69fc11002bbd063afdeec9362b6e00a61a;hb=1b13ccb59263b66abc763fb8f298b14bdebc9582;hp=ee3834111e2cf1ce70338a5f507e06c4070a8318;hpb=9fa82649c6bc8e21f6ecfeb95c8c15db7c8f8352;p=des2015.git

diff --git a/dsl/runtime/src/nl/ru/des/Marster.java b/dsl/runtime/src/nl/ru/des/Marster.java
index ee38341..81ee5f6 100644
--- a/dsl/runtime/src/nl/ru/des/Marster.java
+++ b/dsl/runtime/src/nl/ru/des/Marster.java
@@ -1,6 +1,7 @@
 package nl.ru.des;
 
 import java.util.LinkedList;
+import java.util.Random;
 
 import lejos.hardware.ev3.EV3;
 import lejos.hardware.ev3.LocalEV3;
@@ -17,12 +18,12 @@ import lejos.hardware.sensor.NXTLightSensor;
 import lejos.robotics.RegulatedMotor;
 import lejos.robotics.SampleProvider;
 import nl.ru.des.sensors.BTController;
-import nl.ru.des.Arbitrator;
 import nl.ru.des.sensors.RemoteSensors;
 import nl.ru.des.sensors.SensorCollector;
 
 public class Marster {
 	public static Arbitrator arb;
+	public static Random random;
 	
 	@SuppressWarnings("resource")
 	public static void main(String[] args) {
@@ -80,9 +81,11 @@ public class Marster {
 			BTController.startMaster(slave, sc);
 			LCDPrinter.print("Finished loading");
 			LinkedList<Mission> missions = Missions.getMissions(sc, rightMotor, leftMotor, measMotor);
+			random = new Random();
 			for(Mission m : missions){
 				LCDPrinter.print("Start " + m.name + " mission...");
 				arb = new Arbitrator(m.behaviours);
+				sc.resetColors();
 				arb.start();
 				LCDPrinter.print(m.name + " finished!!1one!");
 			}