X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=0304e7ee20993e4396aa0c03051c0d288604d19b;hb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;hp=bb5b353332a2ec191ae3b3c9d5a494369d5bc2e9;hpb=f30142f32b5aec7e51200b6045014993c700b74a;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index bb5b353..0304e7e 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -8,23 +8,26 @@ import iTasksTTY
 import TTY
 import qualified Data.Map as DM
 import Utils.SDS
+import Utils.Devices
 
 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 $
 
-derive class iTask MTaskDevice, MTaskResource, MTaskMSGRecv, MTaskMSGSend
+derive class iTask MTaskDevice, MTaskResource, MTaskMSGRecv, MTaskMSGSend, BCShare
 derive conses MTaskResource, TTYSettings, BaudRate, Parity, ByteSize, TCPSettings
 derive consName MTaskResource, TTYSettings, BaudRate, Parity, ByteSize, TCPSettings
 
 instance == MTaskDevice where
 	(==) a b = a.deviceChannels == b.deviceChannels
 
-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
@@ -32,6 +35,7 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		,deviceName=name
 		,deviceTasks=[]
 		,deviceTask=Nothing
+		,deviceError=Nothing
 		,deviceData=res}
 
 getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
@@ -45,26 +49,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 $ traceValue "viewDevice" >>| anyTask 
 		[viewInformation "Device settings" [] d @! ()
 		,viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
 		,forever $ 
@@ -72,7 +82,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)
 
@@ -84,29 +96,31 @@ deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d)
 
 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->set sdss sdsStore//MTaskShareaddToSDSShare
-	>>| makeShares sdss
-	>>| sendMessage device msgs
+		traceValue "starting to send"
+	>>| get bcStateStore @ toMessages timeout o toRealByteCode (unMain mTask)
+	>>= \(msgs, st1)->traceValue "messages generated"
+	>>| set st1 bcStateStore
+	>>| traceValue "bcstate store updated"
+	>>| toSDSRecords st1
+	>>= \sdss->traceValue "Shares created"
+	>>| set sdss sdsStore//MTaskShareaddToSDSShare
+	>>| traceValue "Shares store updated"
+	>>| sendMessages msgs device
+	>>| traceValue "Messages sent"
 	>>| makeTask wta -1
-	>>= withDevices device o addTask
+	>>= \t->traceValue "Task made"
+	>>| withDevices device (addTask t)
+	>>| traceValue "Tasks share updated"
 	@! ()
 	where
 		sharename i = device.deviceChannels +++ "-" +++ toString i
-		toSDSRecords st = [{MTaskShare |
-			initValue=toInt d1*265 + toInt d2,
-			withTask=wta,
-			identifier=i,
-			realShare="mTaskSDS-" +++ toString i}
-				\\(i,[d1,d2])<-st.sdss]
-		makeShares = foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ())
+		toSDSRecords st = sequence "" [makeShare wta sdsi sdsval\\{sdsi,sdspub,sdsval}<-st.sdss]// | sdspub]
 
 		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) @! ()
+sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
+sendMessages msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) o channels
 
 withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
 withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStore @! ()
@@ -121,7 +135,7 @@ deviceTaskAcked dev i
 			[{t & ident=i}:ts] [t:ackFirst ts]
 
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
-deviceTaskDelete dev task = sendMessage dev [MTTaskDel task.ident]
+deviceTaskDelete dev task = sendMessages [MTTaskDel task.ident] dev @! ()
 
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
 deviceTaskDeleteAcked d i = withDevices d $ deleteTask