X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Tasks%2FmTaskTask.icl;h=27edc82a3658d62e1c7013e45d0736c9dd6a8450;hb=71726cdfddd9dfa11395f10ef3b5af28613fd5a0;hp=208b1232ef5480e5c51d8e16ed072801ac8d7055;hpb=4bb252b0423c73d134a541db44b8b08eab507a39;p=mTask.git

diff --git a/Tasks/mTaskTask.icl b/Tasks/mTaskTask.icl
index 208b123..27edc82 100644
--- a/Tasks/mTaskTask.icl
+++ b/Tasks/mTaskTask.icl
@@ -4,7 +4,6 @@ import mTask
 import iTasks
 import Devices.mTaskDevice
 
-
 import iTasks._Framework.Serialization
 
 derive class iTask MTaskTask, MTaskInterval, Main, ByteCode, Stmt, Expr, BC, BCState, RWST, Identity
@@ -13,12 +12,12 @@ makeTask :: String Int -> Task MTaskTask
 makeTask name ident = get currentDateTime 
 	@ \dt->{MTaskTask | name=name,ident=ident,dateAdded=dt}
 
-sendTaskToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
+sendTaskToDevice :: String (Main (ByteCode a Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
 sendTaskToDevice wta mTask (device, timeout) =
 		get bcStateStore @ toMessages timeout mTask
 	>>= \(msgs, st1)->set st1 bcStateStore
 	>>| toSDSRecords msgs st1 device
-	>>= \sdss->upd (mergeShares sdss) sdsStore 
+	>>= \sdss->updateShares device ((++) sdss)
 	>>| sendMessages msgs device
 	>>| makeTask wta -1
 	>>= withDevices device o addTask
@@ -28,12 +27,8 @@ sendTaskToDevice wta mTask (device, timeout) =
 
 		toSDSRecords :: [MTaskMSGSend] BCState MTaskDevice -> Task [MTaskShare]
 		toSDSRecords s st device = treturn 
-			[makeShare wta device.deviceName sdsi sdsval
-			\\{sdsi,sdspub,sdsval}<-st.sdss
-			, (MTSds sdsi` _)<-s
-			| sdsi == sdsi`]
-
-		mergeShares a b = a ++ b
+			[makeShare wta sdsi sdsval
+			\\{sdsi,sdsval}<-st.sdss, (MTSds sdsi` _)<-s | sdsi == sdsi`]
 
 		addTask :: MTaskTask MTaskDevice -> MTaskDevice
 		addTask task device = {device & deviceTasks=[task:device.deviceTasks]}