X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=58dd5eda515114cdb62a4610a005b5c3534a6f31;hb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;hp=4fff9ae4813499c32a39bbb6828f2beab889468c;hpb=71787cb6678d7a0d2014d373af5e55447796f78d;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 4fff9ae..58dd5ed 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -13,6 +13,7 @@ import GenBimap
 import Devices.mTaskSerial
 import Devices.mTaskTCP
 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
 
 from Data.Func import $
 
@@ -26,12 +27,17 @@ instance == MTaskDevice where
 channels :: MTaskDevice -> Shared Channels
 channels d = memoryShare d.deviceChannels ([], [], False)
 
+startupDevices :: Task [MTaskDevice]
+startupDevices = upd (map reset) deviceStore
+	where reset d = {d & deviceTask=Nothing, deviceTasks=[], deviceError=Nothing}
+
 makeDevice :: String MTaskResource -> Task MTaskDevice
 makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		|deviceChannels=name +++ toString rand
 		,deviceName=name
 		,deviceTasks=[]
 		,deviceTask=Nothing
+		,deviceError=Nothing
 		,deviceData=res}
 
 getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
@@ -45,26 +51,32 @@ addDevice devices processFun
 		Nothing = viewInformation "No type selected yet" [] ""
 		Just ty = enterInformation "Name" [] -&&- deviceSettings ty
 			>>= \(name, settings)->makeDevice name settings
-			>>= \dev->appendTopLevelTask 'DM'.newMap True (tlt dev)
-			>>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices
+			>>= \dev->upd (\l->[dev:l]) devices
+			>>| connectDevice processFun dev
 			@! ""
 	where
-		tlt dev = let ch = channels dev in processFun dev ch -||- getSynFun dev.deviceData ch
-
 		deviceSettings "SerialDevice" = getmTaskSerialDevice
 		deviceSettings "TCPDevice" = getmTaskTCPDevice
 
 		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}) @! ()
+	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 d <<@ Title d.deviceName\\d<-ds]]
+			[viewDevice processFun d 
+				<<@ Title d.deviceName\\d<-ds]]
 	<<@ ArrangeWithTabs @! ()
 
-viewDevice :: MTaskDevice -> Task ()
-viewDevice d = forever $ anyTask 
+viewDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
+viewDevice pf d = forever $ anyTask 
 		[viewInformation "Device settings" [] d @! ()
 		,viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
 		,forever $ 
@@ -72,7 +84,9 @@ viewDevice d = forever $ anyTask
 			>>* [OnAction (Action "Delete") $ ifValue (\t->t.ident <> -1) (deviceTaskDelete d)]
 			@! ()
 		] <<@ ArrangeHorizontal
-		>>* [OnAction (Action "Delete Device") (always $ deleteDevice d)]
+		>>* [OnAction (Action "Delete Device") (always $ deleteDevice d):
+				if (isJust d.deviceTask) []
+				[OnAction (Action "Connect") (always $ connectDevice pf d)]]
 	where
 		dropEmpty (r,s,ss) = (filter ((=!=)MTEmpty) r,s,ss)
 
@@ -82,15 +96,15 @@ deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d)
 	>>| upd (filter ((==)d)) deviceStore
 	@! ()
 
-sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, Int) -> Task ()
+sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
 sendToDevice wta mTask (device, timeout) =
 		get bcStateStore @ toMessages timeout o toRealByteCode (unMain mTask)
 	>>= \(msgs, st1)->set st1 bcStateStore @ toSDSRecords
-	>>= \sdss->upd ((++)sdss) sdsStore//MTaskShareaddToSDSShare
+	>>= \sdss->set sdss sdsStore//MTaskShareaddToSDSShare
 	>>| makeShares sdss
 	>>| sendMessage device msgs
 	>>| makeTask wta -1
-	>>= withDevices device o addTask timeout
+	>>= withDevices device o addTask
 	@! ()
 	where
 		sharename i = device.deviceChannels +++ "-" +++ toString i
@@ -102,8 +116,8 @@ sendToDevice wta mTask (device, timeout) =
 				\\(i,[d1,d2])<-st.sdss]
 		makeShares = foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ())
 
-		addTask :: Int MTaskTask MTaskDevice -> MTaskDevice
-		addTask timeout task device = {device & deviceTasks=[task:device.deviceTasks]}
+		addTask :: MTaskTask MTaskDevice -> MTaskDevice
+		addTask task device = {device & deviceTasks=[task:device.deviceTasks]}
 
 sendMessage :: MTaskDevice [MTaskMSGSend] -> Task ()
 sendMessage dev msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) (channels dev) @! ()