rewrite generation to rws

[mTask.git] / Tasks / Examples.icl

diff --git a/Tasks/Examples.icl b/Tasks/Examples.icl
index b2a79de..d82a767 100644 (file)
--- a/Tasks/Examples.icl
+++ b/Tasks/Examples.icl
@@ -6,8 +6,6 @@ import mTask
 import Devices.mTaskDevice
 import iTasks._Framework.Serialization
 
-derive class iTask UserLED
-
 countAndLed :: Main (ByteCode () Stmt)
 countAndLed = sds \x=1 In sds \pinnetje=1 In {main =
        IF (digitalRead D3) (
@@ -17,35 +15,45 @@ countAndLed = sds \x=1 In sds \pinnetje=1 In {main =
                noOp
        ) :.
        IF (pinnetje ==. lit 1) (
-               ledOn LED1
+               ledOn (lit LED1)
        ) (
                IF (pinnetje ==. lit 2) (
-                       ledOn LED2
+                       ledOn (lit LED2)
                ) (
-                       ledOn LED3
+                       ledOn (lit LED3)
                )
        )}
 
-blink :: UserLED -> Main (ByteCode () Stmt)
-blink led = sds \x=1 In {main =
+blinkShare :: Main (ByteCode () Stmt)
+blinkShare = sds \x=1 In sds \led=LED1 In {main =
        IF (x ==. lit 1) (
                ledOn led  ) (
                ledOff led ) :.
        x =. lit 1 -. x :. noOp
        }
 
+blink :: UserLED -> Main (ByteCode () Stmt)
+blink l = sds \x=1 In {main =
+       IF (x ==. lit 1) (
+               ledOn (lit l)  ) (
+               ledOff (lit l) ) :.
+       x =. lit 1 -. x :. noOp
+       }
+
 ledtOn :: UserLED -> Main (ByteCode () Stmt)
-ledtOn d = {main = ledOn d}
+ledtOn d = {main = ledOn (lit d) :. noOp}
 
 ledtOff :: UserLED -> Main (ByteCode () Stmt)
-ledtOff d = {main = ledOff d}
+ledtOff d = {main = ledOff (lit d) :. noOp}
 
 ledSelection :: Task UserLED
 ledSelection = enterInformation "Select LED" []
 
 allmTasks :: Map String (Task (Main (ByteCode () Stmt)))
-allmTasks = 'DM'.fromList [
-       ("countAndLed", treturn countAndLed),
-       ("ledOn", ledSelection @ ledtOn),
-       ("ledOff", ledSelection @ ledtOff),
-       ("blink", ledSelection @ blink)]
+allmTasks = 'DM'.fromList
+       [("countAndLed", treturn countAndLed)
+       ,("ledOn", ledSelection @ ledtOn)
+       ,("ledOff", ledSelection @ ledtOff)
+       ,("blink", ledSelection @ blink)
+       ,("blinkShare", treturn blinkShare)
+       ]