shares are now lenses

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index fda80c8..2a80f5c 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -24,57 +24,52 @@ import iTasks._Framework.Serialization
 
 import TTY, iTasksTTY
 
-//derive class iTask ByteSize, Parity, BaudRate, TTYSettings, TCPSettings
-//derive class iTask MTaskDeviceSpec, MTaskResource, MTaskTask, MTaskDevice
+Start world = startEngine [
+               publish "/manage" $ const $ mTaskManager
+                       >>* [OnAction (Action "Shutdown") (always $ shutDown)],
+               publish "/" $ const demo
+       ] world
 
-Start :: *World -> *World
-Start world = startEngine (viewInformation "" [] md) world
+demo = viewSharedInformation "Devices" [] deviceStoreNP
+       >>* [OnValue $ ifValue pred (cont o hd)]
        where
-               md = 
-                       { deviceTask = Just $ TaskId 0 0
-                       , deviceError = Just ""
-                       , deviceChannels = "abc"
-                       , deviceName = "hoi"
-                       , deviceTasks = []
-                       , deviceData = TCPDevice {TCPSettings
-                               |host="localhost",
-                               port=8888
-                               }
-                       , deviceSpec = Just {MTaskDeviceSpec
-                               |haveLed = True
-                               ,haveAio = True
-                               ,haveDio = True
-                               ,maxTask = 42
-                               ,maxSDS = 5
-                               }
-                       }
-                       
-                       
+               pred [] = False
+               pred [x:_] = not $ isEmpty x.deviceShares
 
-//Start world = startEngine (mTaskManager
-//     >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+               cont :: MTaskDevice -> Task ()
+               cont dev
+               # rs = getRealShare dev (hd dev.deviceShares)
+               = get rs >>= \oldvalue->
+                       forever (updateSharedInformation "Blinkyblink" [] (getRealShare dev (hd dev.deviceShares))
+                       >>* [OnAction ActionContinue (const $ Just $ treturn ())])
+                -|| (wait "bigger than 10" (\x->x == oldvalue) rs
+                       >>= viewInformation "Bigger:)" [])
+
+               toInt :: BCValue -> Int
+               toInt (BCValue e) = dynToInt (dynamic e)
+                       
+               dynToInt :: Dynamic -> Int
+               dynToInt (a :: Int) = a
+               dynToInt x = abort "Not an int"
 
 mTaskManager :: Task ()
-mTaskManager = startupDevices >>| anyTask 
-               [ viewmTasks @! ()
-               , whileUnchanged sdsStore manageShares
-               , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout (sequenceLayouts 
-                       [ arrangeWithSideBar 0 LeftSide 260 True
-                       , arrangeSplit Vertical True
-                       ])
+mTaskManager = (>>|) startupDevices $ 
+               viewmTasks ||-
+               ((manageShares ||- whileUnchanged deviceStoreNP (manageDevices process))
+                       <<@ ArrangeSplit Vertical True)
+               <<@ ArrangeWithSideBar 0 LeftSide 260 True
        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
+                               Just mTaskTask = get deviceStoreNP
                                        >>= \devices->case devices of
                                                [] = viewInformation "No devices yet" [] ()
                                                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)]
+                                                       ) >>* [OnAction (Action "Send") (withValue $ Just o sendTaskToDevice mTaskTask bc)]
                                                        @! ()
                                )
 
@@ -89,8 +84,8 @@ mTaskManager = startupDevices >>| anyTask
                                proc [m:ms] = traceValue (toString m) >>| (case m of
 //                                     MTSDSAck i = traceValue (toString m) @! ()
 //                                     MTSDSDelAck i = traceValue (toString m) @! ()
-                                       MTPub i val = updateShare i val
-                                       MTTaskAck i = deviceTaskAcked device i
+                                       MTPub i val = updateShareFromPublish device i val @! ()
+                                       MTTaskAck i mem = deviceTaskAcked device i mem @! ()
                                        MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
                                        MTDevSpec s = deviceAddSpec device s @! ()
                                        _ = treturn ()