X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=0a6ab0f09ee5bd1b252daaab094d7662394c1503;hb=848595d1288804d6de43625f9e6f1cf76295c285;hp=95c549e32508c456e7139f8cba2d2b2f058a8ba4;hpb=4bb252b0423c73d134a541db44b8b08eab507a39;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 95c549e..0a6ab0f 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -14,6 +14,7 @@ import Utils.Devices
 import GenBimap
 import Devices.mTaskSerial
 import Devices.mTaskTCP
+import Data.Tuple
 import iTasks._Framework.Store
 import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.Editor.Builtin, iTasks.UI.Editor.Common, iTasks.UI.Layout.Default, iTasks.UI.Layout.Common
 
@@ -27,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,7 +45,8 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		,deviceTask=Nothing
 		,deviceError=Nothing
 		,deviceData=res
-		,deviceSpec=Nothing}
+		,deviceSpec=Nothing
+		,deviceShares=[]}
 
 getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
 getSynFun (TCPDevice t) = synFun t
@@ -67,18 +69,27 @@ addDevice devices processFun
 		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 [
-		addDevice deviceStore processFun <<@ Title "Add new device" @! ():
+		addDevice deviceStoreNP processFun <<@ Title "Add new device" @! ():
 			[viewDevice processFun d 
 				<<@ Title d.deviceName\\d<-ds]]
 	<<@ ArrangeWithTabs @! ()
@@ -94,24 +105,33 @@ viewDevice pf d = forever $ traceValue "viewDevice" >>| 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)
 
 deleteDevice :: MTaskDevice -> Task ()
-deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d)
+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
-	>>| cleanSharesDevice d.deviceName
+	>>| upd (filter ((<>)d)) deviceStoreNP
+//	>>| cleanSharesDevice d.deviceName
 	@! ()
 
-sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
-sendMessages msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) o channels
+sendMessages :: [MTaskMSGSend] MTaskDevice -> Task Channels
+sendMessages msgs dev = upd (realMessageSend msgs) $ channels dev
+
+sendMessagesIW :: [MTaskMSGSend] MTaskDevice *IWorld -> *(MaybeError TaskException (), *IWorld)
+sendMessagesIW msgs dev iworld 
+	= modify (tuple () o realMessageSend msgs) (channels dev) iworld
+
+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) deviceStoreNP
 
-deviceTaskAcked :: MTaskDevice Int Int -> Task ()
+deviceTaskAcked :: MTaskDevice Int Int -> Task [MTaskDevice]
 deviceTaskAcked dev i mem
 	= withDevices dev (\d->{d
 			&deviceTasks=ackFirst d.deviceTasks
@@ -125,10 +145,10 @@ deviceTaskAcked dev i mem
 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}