small update

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index fda80c8..0e7a631 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -24,45 +24,22 @@ 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
-       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
-                               }
-                       }
-                       
-                       
-
-//Start world = startEngine (mTaskManager
-//     >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+demo = viewInformation "" [] "Hello world"
 
 mTaskManager :: Task ()
 mTaskManager = startupDevices >>| anyTask 
                [ viewmTasks @! ()
                , whileUnchanged sdsStore manageShares
                , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout (sequenceLayouts 
-                       [ arrangeWithSideBar 0 LeftSide 260 True
-                       , arrangeSplit Vertical True
-                       ])
+               ] <<@ ApplyLayout (sequenceLayouts
+                       [arrangeWithSideBar 0 LeftSide 260 True
+                       ,arrangeSplit Vertical True])
        where
                viewmTasks :: Task String
                viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
@@ -74,7 +51,7 @@ mTaskManager = startupDevices >>| anyTask
                                                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)]
                                                        @! ()
                                )
 
@@ -90,7 +67,7 @@ mTaskManager = startupDevices >>| anyTask
 //                                     MTSDSAck i = traceValue (toString m) @! ()
 //                                     MTSDSDelAck i = traceValue (toString m) @! ()
                                        MTPub i val = updateShare i val
-                                       MTTaskAck i = deviceTaskAcked device i
+                                       MTTaskAck i mem = deviceTaskAcked device i mem
                                        MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
                                        MTDevSpec s = deviceAddSpec device s @! ()
                                        _ = treturn ()