repositories
/
des2015.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update language'
[des2015.git]
/
dsl
/
runtime
/
src
/
nl
/
ru
/
des
/
BasicBehaviour.java
diff --git
a/dsl/runtime/src/nl/ru/des/BasicBehaviour.java
b/dsl/runtime/src/nl/ru/des/BasicBehaviour.java
index
aeb138d
..
c91e613
100644
(file)
--- 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 lejos.hardware.motor.EV3LargeRegulatedMotor;
import lejos.robotics.subsumption.Behavior;
+import nl.ru.des.sensors.SensorCollector;
public abstract class BasicBehaviour implements Behavior{
protected boolean suppressed;
public abstract class BasicBehaviour implements Behavior{
protected boolean suppressed;
- protected EV3LargeRegulatedMotor leftMotor, rightMotor;
+ protected EV3LargeRegulatedMotor leftMotor, rightMotor
, measMotor
;
protected SensorCollector sensors;
protected SensorCollector sensors;
- protected ColorMemory colors;
protected long time;
public BasicBehaviour(SensorCollector sensors, EV3LargeRegulatedMotor leftMotor,
protected long time;
public BasicBehaviour(SensorCollector sensors, EV3LargeRegulatedMotor leftMotor,
- EV3LargeRegulatedMotor rightMotor,
ColorMemory colors
){
+ EV3LargeRegulatedMotor rightMotor,
EV3LargeRegulatedMotor measMotor
){
this.leftMotor = leftMotor;
this.rightMotor = rightMotor;
this.leftMotor = leftMotor;
this.rightMotor = rightMotor;
- this.
colors = colors
;
+ this.
measMotor = measMotor
;
this.sensors = sensors;
}
this.sensors = sensors;
}
@@
-26,6
+26,14
@@
public abstract class BasicBehaviour implements Behavior{
rightMotor.stop(true);
leftMotor.stop(true);
}
rightMotor.stop(true);
leftMotor.stop(true);
}
+
+ protected void rockMeasure(){
+
+ }
+
+ protected void lakeMeasure(){
+
+ }
@Override
public void action() {
@Override
public void action() {