X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=5c78b48742ef5918e68fd39a5e4d80db5523493e;hb=feacd1b50fca9624284f8b8c22c26d7a8071515d;hp=0304e7ee20993e4396aa0c03051c0d288604d19b;hpb=5f4c4b61ea1e4062e90715af9e1027da6d1c7a66;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 0304e7e..5c78b48 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -36,7 +36,8 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		,deviceTasks=[]
 		,deviceTask=Nothing
 		,deviceError=Nothing
-		,deviceData=res}
+		,deviceData=res
+		,deviceSpec=Nothing}
 
 getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
 getSynFun (TCPDevice t) = synFun t
@@ -91,26 +92,18 @@ viewDevice pf d = forever $ traceValue "viewDevice" >>| anyTask
 deleteDevice :: MTaskDevice -> Task ()
 deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d)
 	>>| maybe (treturn ()) (flip removeTask topLevelTasks) d.deviceTask
-	>>| upd (filter ((==)d)) deviceStore
+	>>| upd (filter ((<>)d)) deviceStore
 	@! ()
 
 sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
 sendToDevice wta mTask (device, timeout) =
-		traceValue "starting to send"
-	>>| get bcStateStore @ toMessages timeout o toRealByteCode (unMain mTask)
-	>>= \(msgs, st1)->traceValue "messages generated"
-	>>| set st1 bcStateStore
-	>>| traceValue "bcstate store updated"
+		get bcStateStore @ toMessages timeout o toRealByteCode (unMain mTask)
+	>>= \(msgs, st1)->set st1 bcStateStore
 	>>| toSDSRecords st1
-	>>= \sdss->traceValue "Shares created"
-	>>| set sdss sdsStore//MTaskShareaddToSDSShare
-	>>| traceValue "Shares store updated"
+	>>= \sdss->set sdss sdsStore//MTaskShareaddToSDSShare
 	>>| sendMessages msgs device
-	>>| traceValue "Messages sent"
 	>>| makeTask wta -1
-	>>= \t->traceValue "Task made"
-	>>| withDevices device (addTask t)
-	>>| traceValue "Tasks share updated"
+	>>= withDevices device o addTask
 	@! ()
 	where
 		sharename i = device.deviceChannels +++ "-" +++ toString i
@@ -140,3 +133,6 @@ deviceTaskDelete dev task = sendMessages [MTTaskDel task.ident] dev @! ()
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
 deviceTaskDeleteAcked d i = withDevices d $ deleteTask
 	where deleteTask d = {d & deviceTasks=[s\\s<-d.deviceTasks | i <> s.ident]}
+
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()
+deviceAddSpec d s = withDevices d $ \r->{MTaskDevice | r & deviceSpec=Just s}