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

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 0304e7e..5e3f6dc 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
@@ -62,7 +63,9 @@ addDevice devices processFun
 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}) @! ()
+	>>= \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})
 
@@ -91,33 +94,10 @@ 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
+//	>>| upd (removeShares d) sdsStore
 	@! ()
 
-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"
-	>>| toSDSRecords st1
-	>>= \sdss->traceValue "Shares created"
-	>>| set sdss sdsStore//MTaskShareaddToSDSShare
-	>>| traceValue "Shares store updated"
-	>>| sendMessages msgs device
-	>>| traceValue "Messages sent"
-	>>| makeTask wta -1
-	>>= \t->traceValue "Task made"
-	>>| withDevices device (addTask t)
-	>>| traceValue "Tasks share updated"
-	@! ()
-	where
-		sharename i = device.deviceChannels +++ "-" +++ toString i
-		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]}
 
 sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
 sendMessages msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) o channels
@@ -140,3 +120,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}