X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2FMarsRover.java;fp=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2FMarsRover.java;h=0000000000000000000000000000000000000000;hb=34dae1e7f9c49481d90b3d26978cc5ab52ccc050;hp=8561c0a5db3249a32c5829fb8287258ec0139d9c;hpb=c9506d94c22f96ba5ffea707f5040fcc9d6c3c3f;p=des2015.git

diff --git a/dsl/runtime/src/nl/ru/des/MarsRover.java b/dsl/runtime/src/nl/ru/des/MarsRover.java
deleted file mode 100644
index 8561c0a..0000000
--- a/dsl/runtime/src/nl/ru/des/MarsRover.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package nl.ru.des;
-
-import java.util.LinkedList;
-
-import lejos.hardware.ev3.EV3;
-import lejos.hardware.ev3.LocalEV3;
-import lejos.hardware.lcd.Font;
-import lejos.hardware.lcd.TextLCD;
-import lejos.hardware.motor.EV3LargeRegulatedMotor;
-import lejos.hardware.port.MotorPort;
-import lejos.hardware.sensor.EV3ColorSensor;
-import lejos.hardware.sensor.EV3TouchSensor;
-import lejos.hardware.sensor.EV3UltrasonicSensor;
-import lejos.robotics.SampleProvider;
-import lejos.robotics.subsumption.Arbitrator;
-
-public class MarsRover {
-	public static final float SAMPLERATE = 100;
-	public static Arbitrator arb;
-	
-	@SuppressWarnings("resource")
-	public static void main(String[] args) {
-		EV3 brick = LocalEV3.get();
-		TextLCD tlcd = brick.getTextLCD(Font.getSmallFont());
-		LCDPrinter.startLCDPrinter(tlcd);
-		System.setOut(LCDPrinter.getPrefixedPrintstream("out: ", tlcd));
-		System.setErr(LCDPrinter.getPrefixedPrintstream("err: ", tlcd));
-		
-		LCDPrinter.print("Loading keylistener...");
-		brick.getKey("Escape").addKeyListener(new ButtonListener());
-
-		LCDPrinter.print("Loading motors...");
-		EV3LargeRegulatedMotor rightMotor = new EV3LargeRegulatedMotor(MotorPort.D);
-		EV3LargeRegulatedMotor leftMotor = new EV3LargeRegulatedMotor(MotorPort.A);
-		leftMotor.setSpeed(Constants.speed);
-		rightMotor.setSpeed(Constants.speed);
-		rightMotor.setAcceleration(Constants.acceleration);
-		leftMotor.setAcceleration(Constants.acceleration);
-		
-		LCDPrinter.print("Loading touch sensors...");
-		SampleProvider leftTouch = new EV3TouchSensor(brick.getPort("S1")).getTouchMode();
-		SampleProvider rightTouch = new EV3TouchSensor(brick.getPort("S4")).getTouchMode();
-		
-		LCDPrinter.print("Loading color sensor...");
-		SampleProvider color = new EV3ColorSensor(brick.getPort("S2")).getColorIDMode();
-		
-		LCDPrinter.print("Loading ultrasone sensor...");
-		SampleProvider ultraSonic = new EV3UltrasonicSensor(brick.getPort("S3")).getDistanceMode();
-
-		LCDPrinter.print("Initializing behaviours...");
-		SensorCollector sensors = new SensorCollector(ultraSonic, color, leftTouch, rightTouch);
-		
-		LCDPrinter.print("Initializing color collector...");
-		ColorMemory colorMemory = new ColorMemory(color);
-		
-		Arbitrator a;
-		LinkedList<Mission> missions = Missions.getMissions(sensors, rightMotor, leftMotor, colorMemory);
-		for(Mission m : missions){
-			LCDPrinter.print("Start " + m.name + " mission...");
-			a = new Arbitrator(m.behaviours);
-			a.start();
-		}
-	}
-}
\ No newline at end of file