BCValue is existential now

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index 4bef600..5a65116 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -7,6 +7,7 @@ import iTasks
 import mTask
 import Devices.mTaskDevice
 import Shares.mTaskShare
+import Tasks.Examples
 import Utils.SDS
 
 from Text import class Text(startsWith,concat,split,join), instance Text String
@@ -19,69 +20,37 @@ import Data.List
 import System.Directory
 
 import iTasks._Framework.Store
+import iTasks._Framework.Serialization
 
 import TTY, iTasksTTY
 
-derive class iTask UserLED
-
 Start :: *World -> *World
 Start world = startEngine (mTaskManager
        >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
 
-mTaskMap :: Map String (Main (ByteCode () Stmt))
-mTaskMap = 'DM'.fromList [("count", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)]
-
-bc :: Main (ByteCode () Stmt)
-bc = sds \x=1 In sds \pinnetje=1 In {main =
-               IF (digitalRead D3) (
-                       x =. x +. lit 1 :.
-                       pub x
-               ) (
-                       noOp
-               ) :.
-               IF (pinnetje ==. lit 1) (
-                       ledOn LED1
-               ) (
-                       IF (pinnetje ==. lit 2) (
-                               ledOn LED2
-                       ) (
-                               ledOn LED3
-                       )
-               )}
-
-bc2 :: UserLED -> Main (ByteCode () Stmt)
-bc2 d = {main = ledOn d}
-
-bc3 :: UserLED -> Main (ByteCode () Stmt)
-bc3 d = {main = ledOff d}
-
 mTaskManager :: Task ()
-mTaskManager = anyTask 
+mTaskManager = startupDevices >>| anyTask 
                [ viewmTasks @! ()
-               , whileUnchanged sdsStore viewShares
+               , whileUnchanged sdsStore manageShares
                , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout layout
-       where
-               layout = sequenceLayouts
+               ] <<@ ApplyLayout (sequenceLayouts 
                        [ arrangeWithSideBar 0 LeftSide 260 True
                        , arrangeSplit Vertical True
-                       ]
-
-               viewmTasks = listmTasks
+                       ])
+       where
+               viewmTasks :: Task String
+               viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
                        >&^ \sh->whileUnchanged sh $ \mi->forever (case mi of
                                Nothing = viewInformation "No task selected" [] ()
                                Just mTaskTask = get deviceStore
                                        >>= \devices->case devices of
                                                [] = viewInformation "No devices yet" [] ()
-                                               ds = sendmTask mTaskTask ds @! ())
-                       where
-                               listmTasks :: Task String
-                               listmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
-
-                               sendmTask mTaskId ds = 
-                                               (enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
-                                               -&&- enterInformation "Timeout, 0 for one-shot" [])
-                                       >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskMap mTaskId)]
+                                               ds = fromJust ('DM'.get mTaskTask allmTasks)
+                                                       >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
+                                                               -&&- enterInformation "Timeout" []
+                                                       ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)]
+                                                       @! ()
+                               )
 
                process :: MTaskDevice (Shared Channels) -> Task ()
                process device ch = forever (watch ch >>* [OnValue (
@@ -93,7 +62,7 @@ mTaskManager = anyTask
                                proc [m:ms] = (case m of
 //                                     MTSDSAck i = traceValue (toString m) @! ()
 //                                     MTSDSDelAck i = traceValue (toString m) @! ()
-                                       MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! ()
+//                                     MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! ()
                                        MTTaskAck i = deviceTaskAcked device i
                                        MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
                                        MTEmpty = treturn ()