repositories
/
des2015.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working multiple missions
[des2015.git]
/
dsl
/
xtend
/
src
/
robots
/
missions
/
generator
/
TaskDSLGenerator.xtend
diff --git
a/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
b/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
index
8e25b69
..
ff72ba4
100644
(file)
--- a/
dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
+++ b/
dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
@@
-73,7
+73,7
@@
public class «b.name»Behaviour extends BasicBehaviour {
}
«IF b.tc != null»
@Override public boolean takeControl(){
}
«IF b.tc != null»
@Override public boolean takeControl(){
- return
suppressed
== SuppressedState.IN_ACTION || «printExpression(b.tc)»;
+ return
getSuppressed()
== SuppressedState.IN_ACTION || «printExpression(b.tc)»;
}
«ENDIF»
}
«ENDIF»
@@
-89,7
+89,7
@@
public class «b.name»Behaviour extends BasicBehaviour {
«a.whichMotor.d.toString()»Motor.«a.moveDir.d.toString()»();
«ELSEIF a.time != null»
time = System.currentTimeMillis();
«a.whichMotor.d.toString()»Motor.«a.moveDir.d.toString()»();
«ELSEIF a.time != null»
time = System.currentTimeMillis();
- while(
suppressed
!= SuppressedState.SUPPRESSED«IF a.time.time > 0» && System.currentTimeMillis()-time>«a.time.time»«ENDIF»){
+ while(
getSuppressed()
!= SuppressedState.SUPPRESSED«IF a.time.time > 0» && System.currentTimeMillis()-time>«a.time.time»«ENDIF»){
Thread.yield();
}
«ELSEIF a.turnDir != null»
Thread.yield();
}
«ELSEIF a.turnDir != null»