update

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index dfdcd30..ba28987 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -24,39 +24,36 @@ import iTasks._Framework.Serialization
 
 import TTY, iTasksTTY
 
-derive class iTask UserLED
+Start world = startEngine [
+               publish "/manage" $ const $ mTaskManager
+                       >>* [OnAction (Action "Shutdown") (always $ shutDown)],
+               publish "/" $ const demo
+       ] world
 
-Start :: *World -> *World
-Start world = startEngine (mTaskManager
-       >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+demo = viewInformation "" [] "Hello world"
 
 mTaskManager :: Task ()
-mTaskManager = anyTask 
+mTaskManager = startupDevices >>| anyTask 
                [ viewmTasks @! ()
-               , whileUnchanged sdsStore viewShares
+               , whileUnchanged sdsStore manageShares @! ()
                , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout layout
+               ] <<@ ApplyLayout (foldl1 sequenceLayouts
+                       [arrangeWithSideBar 0 LeftSide 260 True
+                       ,arrangeSplit Vertical True])
        where
-               layout = sequenceLayouts
-                       [ arrangeWithSideBar 0 LeftSide 260 True
-                       , arrangeSplit Vertical True
-                       ]
-
-               viewmTasks = listmTasks
+               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 = fromJust ('DM'.get mTaskId allmTasks)
-//                                     >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
-//                                             -&&- enterInformation "Timeout, 0 for one-shot" [])
-//                                     >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice bc)]
+                                               ds = fromJust ('DM'.get mTaskTask allmTasks)
+                                                       >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
+                                                               -&&- enterInformation "Timeout" []
+                                                       ) >>* [OnAction (Action "Send") (withValue $ Just o sendTaskToDevice mTaskTask bc)]
+                                                       @! ()
+                               )
 
                process :: MTaskDevice (Shared Channels) -> Task ()
                process device ch = forever (watch ch >>* [OnValue (
@@ -65,17 +62,13 @@ mTaskManager = anyTask
                        where
                                proc :: [MTaskMSGRecv] -> Task ()
                                proc [] = treturn ()
-                               proc [m:ms] = (case m of
+                               proc [MTEmpty:ms] = proc ms
+                               proc [m:ms] = traceValue (toString m) >>| (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 @! ()
-                                       MTTaskAck i = deviceTaskAcked device i
+                                       MTPub i val = updateShare i val @! ()
+                                       MTTaskAck i mem = deviceTaskAcked device i mem
                                        MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
-                                       MTEmpty = treturn ()
-                                       _ = traceValue (toString m) @! ()
+                                       MTDevSpec s = deviceAddSpec device s @! ()
+                                       _ = treturn ()
                                        ) >>| proc ms
-
-               mapPar :: (a -> Task a) [a] -> Task ()
-               mapPar f l = foldr1 (\x y->f x ||- y) l <<@ ArrangeWithTabs @! ()
-               allAtOnce t = foldr1 (||-) t @! ()
-               //allAtOnce = (flip (@!) ()) o foldr1 (||-)