migrate to new version

[mTask.git] / Devices / mTaskDevice.icl

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 0116b57..a91a0b3 100644 (file)
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -28,11 +28,11 @@ instance == MTaskDevice where
        (==) a b = a.deviceChannels == b.deviceChannels
 
 startupDevices :: Task [MTaskDevice]
-startupDevices = upd (map reset) deviceStore
+startupDevices = upd (map reset) deviceStoreNP
        where reset d = {d & deviceTask=Nothing, deviceTasks=[], deviceError=Nothing}
 
 withDevice :: (MTaskDevice -> Task a) String -> Task a | iTask a
-withDevice f s = get deviceStore
+withDevice f s = get deviceStoreNP
        >>= \ds->case 'DL'.find (\d->d.deviceName == s) ds of
                Nothing = throw "Device not available"
                Just d = f d
@@ -44,6 +44,7 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
                ,deviceTasks=[]
                ,deviceTask=Nothing
                ,deviceError=Nothing
+               ,deviceState=zero
                ,deviceData=res
                ,deviceSpec=Nothing
                ,deviceShares=[]}
@@ -52,15 +53,18 @@ getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
 getSynFun (TCPDevice t) = synFun t
 getSynFun (SerialDevice t) = synFun t
 
-addDevice :: (Shared [MTaskDevice]) (MTaskDevice (Shared Channels) -> Task ()) -> Task String
-addDevice devices processFun
+addDevice :: (MTaskDevice (Shared Channels) -> Task ()) -> Task String
+addDevice processFun
        =   enterChoice "Device type" [] (map consName{|*|} deviceTypes)
        >&^ \sh->whileUnchanged sh $ \mty->case mty of
                Nothing = viewInformation "No type selected yet" [] ""
                Just ty = enterInformation "Name" [] -&&- deviceSettings ty
                        >>= \(name, settings)->makeDevice name settings
-                       >>= \dev->upd (\l->[dev:l]) devices
+                       >>= \dev->traceValue "make device done"
+                       >>| upd (\l->[dev:l]) deviceStoreNP
+                       >>| traceValue "update deviceslist"
                        >>| connectDevice processFun dev
+                       >>| traceValue "device connected"
                        @! ""
        where
                deviceSettings "SerialDevice" = getmTaskSerialDevice
@@ -77,27 +81,29 @@ addDevice devices processFun
 //     @! ()
 //     where
 //             errorHandle e = withDevices d (\d->{d&deviceTask=Nothing,deviceError=Just e}) @! ()
+import StdDebug
 connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task Channels
 connectDevice procFun device = let ch = channels device
-       in appendTopLevelTask 'DM'.newMap True
-               (       procFun device ch 
-               -||- catchAll (getSynFun device.deviceData ch) errHdl)
+       in traceValue "connectDevice" >>| appendTopLevelTask 'DM'.newMap True
+               (       procFun device ch -||- catchAll (getSynFun device.deviceData ch) errHdl)
                >>= \tid->withDevices device (\d->{d&deviceTask=Just tid,deviceError=Nothing})
                >>| upd (\(r,s,ss)->(r,s++[MTSpec],ss)) ch
        where
-               errHdl e = withDevices device (\d->{d & deviceTask=Nothing, deviceError=Just e}) @! ()
-
-manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
-manageDevices processFun ds = anyTask [
-               addDevice deviceStore processFun <<@ Title "Add new device" @! ():
-                       [viewDevice processFun d 
-                               <<@ Title d.deviceName\\d<-ds]]
-       <<@ ArrangeWithTabs @! ()
+               errHdl e
+               | not (trace_tn "error") = undef
+               = withDevices device (\d->{d & deviceTask=Nothing, deviceError=Just e}) @! ()
+
+manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) -> Task ()
+manageDevices processFun = get deviceStoreNP >>= \ds->anyTask [
+               addDevice processFun <<@ Title "Add new device" @! ()]//:
+//                     [viewDevice processFun d <<@ Title d.deviceName\\d<-ds]]
+       <<@ ArrangeWithTabs
+       @! ()
 
 viewDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
 viewDevice pf d = forever $ traceValue "viewDevice" >>| anyTask 
                [viewInformation "Device settings" [] d @! ()
-               ,viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
+               /*,viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()*/
                ,forever $ 
                        enterChoice "Delete task on device" [ChooseFromGrid id] d.deviceTasks
                        >>* [OnAction (Action "Delete") $ ifValue (\t->t.ident <> -1) (deviceTaskDelete d)]
@@ -114,7 +120,7 @@ deleteDevice d = sendMessages [MTShutdown] d
        >>| wait "Waiting for the channels to empty" (\(r,s,ss)->isEmpty s) (channels d)
        >>| upd (\(r,s,ss)->(r,s,True)) (channels d)
        >>| maybe (treturn ()) (flip removeTask topLevelTasks) d.deviceTask
-       >>| upd (filter ((<>)d)) deviceStore
+       >>| upd (filter ((<>)d)) deviceStoreNP
 //     >>| cleanSharesDevice d.deviceName
        @! ()
 
@@ -129,7 +135,7 @@ realMessageSend :: [MTaskMSGSend] Channels -> Channels
 realMessageSend msgs (r,s,ss) = (r,msgs++s,ss)
 
 withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task [MTaskDevice]
-withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStore
+withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStoreNP
 
 deviceTaskAcked :: MTaskDevice Int Int -> Task [MTaskDevice]
 deviceTaskAcked dev i mem