standard missions done

[des2015.git] / dsl / runtime / specs / wander.tdsl

diff --git a/dsl/runtime/specs/wander.tdsl b/dsl/runtime/specs/wander.tdsl
index be30d5a..5b9c1a0 100644 (file)
--- a/dsl/runtime/specs/wander.tdsl
+++ b/dsl/runtime/specs/wander.tdsl
@@ -1,6 +1,12 @@
 Acceleration 1000
 Speed 150
 
+Behaviour Drive
+       take control:
+       action:
+               left motor forward
+               right motor forward
+               wait forever
 Behaviour Wander
        take control:
        action:
@@ -34,7 +40,34 @@ Behaviour StayInFieldB
 Behaviour MeasureLake
        take control: (|| Color is Green Color is Blue Color is Red)
        action:
-               measure
+               measure Lake
+               
+Behaviour LocateL
+       take control: Touched on left
+       action:
+               right motor forward
+               left motor backward
+               wait 500 ms
+               right motor forward
+               left motor forward
+               wait 1000 ms
+               
+Behaviour LocateR
+       take control: Touched on right
+       action:
+               left motor forward
+               right motor backward
+               wait 500 ms
+               right motor forward
+               left motor forward
+               wait 1000 ms
+
+Behaviour Push
+       take control: (&& Touched on left Touched on right)
+       action:
+               left motor forward
+               right motor forward
+               wait 1000 ms
                
 Behaviour BumpL
        take control: Touched on left
@@ -49,10 +82,21 @@ Behaviour BumpR
                right motor backward with speed 50 acceleration 1000
                left motor backward
                wait 2000 ms
+
+Behaviour AvoidHigh
+       take control: Distance dangerous at front
+       action: 
+               turn randomly 10 to 11 degrees
                
-Mission findBlueLakeWhileAvoidingRocks
-       using Wander BumpR BumpL StayInFieldB StayInFieldL StayInFieldR and stops when Color is Blue
-Mission findAllLakesAndMeasureThem
-       using Wander MeasureLake StayInFieldB StayInFieldL StayInFieldR and stops when Collected at least Green Blue Red
-Mission justWander 
-       using Wander StayInFieldB StayInFieldL StayInFieldR and stops when Color is Cyan
\ No newline at end of file
+//Mission pushRock
+//     using Drive LocateR LocateL Push StayInFieldB StayInFieldL StayInFieldR and stops when Never
+Mission avoidHighRocks
+       using Drive AvoidHigh BumpR BumpL StayInFieldB StayInFieldL StayInFieldR and stops when Never
+//Mission measureLake
+//     using Drive MeasureLake and stops when Never
+//Mission findBlueLakeWhileAvoidingRocks
+//     using Wander BumpR BumpL StayInFieldB StayInFieldL StayInFieldR and stops when Color is Blue
+//Mission findAllLakesAndMeasureThem
+//     using Wander MeasureLake StayInFieldB StayInFieldL StayInFieldR and stops when Collected at least Green Blue Red
+//Mission justWander 
+//     using Wander Wander StayInFieldB StayInFieldL StayInFieldR and stops when Color is Cyan
\ No newline at end of file