X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=Devices%2FmTaskDevice.icl;h=a91a0b3de8a1f4ec6ed596fd5f47eb435080d646;hb=6420aa92a3b4b341f8f86654df79adc1ef610741;hp=c8bee618da1aba157a79c0764e05987796e2b14b;hpb=8e31b107ced5cae9230623a22d11ca37f391e74a;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index c8bee61..a91a0b3 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
@@ -43,22 +44,27 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		,deviceTasks=[]
 		,deviceTask=Nothing
 		,deviceError=Nothing
+		,deviceState=zero
 		,deviceData=res
-		,deviceSpec=Nothing}
+		,deviceSpec=Nothing
+		,deviceShares=[]}
 
 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
@@ -67,26 +73,37 @@ 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}) @! ()
+import StdDebug
+connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task Channels
+connectDevice procFun device = let ch = channels device
+	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
-		errorHandle e = withDevices d (\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)]
@@ -94,25 +111,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
-//	>>| upd (removeShares d) sdsStore
+	>>| upd (filter ((<>)d)) deviceStoreNP
+//	>>| cleanSharesDevice d.deviceName
 	@! ()
 
+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
 
-sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
-sendMessages msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) o channels
+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
@@ -126,9 +151,10 @@ deviceTaskAcked dev i mem
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 deviceTaskDelete dev task = sendMessages [MTTaskDel task.ident] dev @! ()
 
-deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
-deviceTaskDeleteAcked d i = withDevices d $ deleteTask
+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}