X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=a99097ddea029cadf935362c6e853397e392aa1f;hb=de76c5f5ac6a0c4291b51d5b2c16e3611b5c99e3;hp=661c701f87a106a2b85f7a6f6769281203f158c5;hpb=9f93ff243f8ba2e1924e70df10978060a3b6f461;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 661c701..a99097d 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -7,6 +7,7 @@ import iTasks
 import iTasksTTY
 import TTY
 import qualified Data.Map as DM
+import qualified Data.List as DL
 import Utils.SDS
 import Utils.Devices
 
@@ -36,7 +37,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 +64,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})
 
@@ -74,7 +78,7 @@ manageDevices processFun ds = anyTask [
 	<<@ ArrangeWithTabs @! ()
 
 viewDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
-viewDevice pf d = forever $ anyTask 
+viewDevice pf d = forever $ traceValue "viewDevice" >>| anyTask 
 		[viewInformation "Device settings" [] d @! ()
 		,viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
 		,forever $ 
@@ -91,33 +95,10 @@ viewDevice pf d = forever $ 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
-	@! ()
-
-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
-	>>| sendMessages msgs device
-	>>| makeTask wta -1
-	>>= withDevices device o addTask
+	>>| upd (filter ((<>)d)) deviceStore
+//	>>| upd (removeShares d) sdsStore
 	@! ()
-	where
-		sharename i = device.deviceChannels +++ "-" +++ toString i
-		toSDSRecords st = [{MTaskShare |
-			withTask=wta,
-			identifier=sdsi,
-			//We skip the only/local shares
-			realShare="mTaskSDS-" +++ toString sdsi}
-				\\{sdsi,sdspub,sdsval}<-st.sdss | sdspub]
 
-		makeShares :: ([MTaskShare] -> Task ())
-		makeShares = undef //foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ())
-
-		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
@@ -134,9 +115,15 @@ deviceTaskAcked dev i
 		ackFirst [t:ts] = if (t.ident == -1)
 			[{t & ident=i}:ts] [t:ackFirst ts]
 
+getDevice :: String -> Task MTaskDevice
+getDevice n = get deviceStore @ fromJust o 'DL'.find (\s->s.deviceName == n)
+
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 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}