X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2FBasicBehaviour.java;h=c91e6138370b8604f5b4126686b84d145bfba04e;hb=d66c5c319eb15f45086d6d0f6bda34b7ebedc42e;hp=aeb138db40d87fbbadf3087396503e3d66a4c87b;hpb=82d6b6dc9f3f9dbcaa9f8320649df29359c83279;p=des2015.git

diff --git a/dsl/runtime/src/nl/ru/des/BasicBehaviour.java b/dsl/runtime/src/nl/ru/des/BasicBehaviour.java
index aeb138d..c91e613 100644
--- a/dsl/runtime/src/nl/ru/des/BasicBehaviour.java
+++ b/dsl/runtime/src/nl/ru/des/BasicBehaviour.java
@@ -2,19 +2,19 @@ package nl.ru.des;
 
 import lejos.hardware.motor.EV3LargeRegulatedMotor;
 import lejos.robotics.subsumption.Behavior;
+import nl.ru.des.sensors.SensorCollector;
 
 public abstract class BasicBehaviour implements Behavior{
 	protected boolean suppressed;
-	protected EV3LargeRegulatedMotor leftMotor, rightMotor;
+	protected EV3LargeRegulatedMotor leftMotor, rightMotor, measMotor;
 	protected SensorCollector sensors;
-	protected ColorMemory colors;
 	protected long time;
 	
 	public BasicBehaviour(SensorCollector sensors, EV3LargeRegulatedMotor leftMotor,
-			EV3LargeRegulatedMotor rightMotor, ColorMemory colors){
+			EV3LargeRegulatedMotor rightMotor, EV3LargeRegulatedMotor measMotor){
 		this.leftMotor = leftMotor;
 		this.rightMotor = rightMotor;
-		this.colors = colors;
+		this.measMotor = measMotor;
 		this.sensors = sensors;
 	}
 	
@@ -26,6 +26,14 @@ public abstract class BasicBehaviour implements Behavior{
 		rightMotor.stop(true);
 		leftMotor.stop(true);
 	}
+
+	protected void rockMeasure(){
+		
+	}
+	
+	protected void lakeMeasure(){
+		
+	}
 	
 	@Override
 	public void action() {