deviceTypes :: [MTaskResource]
deviceTypes = conses{|*|}
-connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
-connectDevice pf d = let ch = channels d in appendTopLevelTask 'DM'.newMap True
- (pf d ch -||- catchAll (getSynFun d.deviceData ch) errorHandle)
- >>= \tid->withDevices d (\d->{d&deviceTask=Just tid,deviceError=Nothing})
- >>| upd (\(r,s,ss)->(r,s++[MTSpec],ss)) ch
- @! ()
+//connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
+//connectDevice pf d = let ch = channels d in appendTopLevelTask 'DM'.newMap True
+// (pf d ch -||- catchAll (getSynFun d.deviceData ch) errorHandle)
+// >>= \tid->withDevices d (\d->{d&deviceTask=Just tid,deviceError=Nothing})
+// >>| upd (\(r,s,ss)->(r,s++[MTSpec],ss)) ch
+// @! ()
+// where
+// errorHandle e = withDevices d (\d->{d&deviceTask=Nothing,deviceError=Just e}) @! ()
+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)
+ >>= \tid->withDevices device (\d->{d&deviceTask=Just tid,deviceError=Nothing})
+ >>| upd (\(r,s,ss)->(r,s++[MTSpec],ss)) ch
where
- errorHandle e = withDevices d (\d->{d&deviceTask=Nothing,deviceError=Just e})
+ errHdl e = withDevices device (\d->{d & deviceTask=Nothing, deviceError=Just e}) @! ()
manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
manageDevices processFun ds = anyTask [
] <<@ ArrangeHorizontal
>>* [OnAction (Action "Delete Device") (always $ deleteDevice d):
if (isJust d.deviceTask) []
- [OnAction (Action "Connect") (always $ connectDevice pf d)]]
+ [OnAction (Action "Connect") (always $ connectDevice pf d @! ())]]
where
dropEmpty (r,s,ss) = (filter ((=!=)MTEmpty) r,s,ss)
realMessageSend :: [MTaskMSGSend] Channels -> Channels
realMessageSend msgs (r,s,ss) = (r,msgs++s,ss)
-withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
-withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStore @! ()
+withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task [MTaskDevice]
+withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStore
-deviceTaskAcked :: MTaskDevice Int Int -> Task ()
+deviceTaskAcked :: MTaskDevice Int Int -> Task [MTaskDevice]
deviceTaskAcked dev i mem
= withDevices dev (\d->{d
&deviceTasks=ackFirst d.deviceTasks
deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
deviceTaskDelete dev task = sendMessages [MTTaskDel task.ident] dev @! ()
-deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
+deviceTaskDeleteAcked :: MTaskDevice Int -> Task [MTaskDevice]
deviceTaskDeleteAcked d i = cleanSharesTask i d
>>| withDevices d deleteTask
where deleteTask d = {d & deviceTasks=[s\\s<-d.deviceTasks | i <> s.ident]}
-deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task [MTaskDevice]
deviceAddSpec d s = withDevices d $ \r->{MTaskDevice | r & deviceSpec=Just s}