X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=28d44c4856dda7c17d8925a9bc75e0d6d3508700;hb=acd239b3f29e215ade0b63d5b26b6cf8e8ae0d63;hp=4fff9ae4813499c32a39bbb6828f2beab889468c;hpb=71787cb6678d7a0d2014d373af5e55447796f78d;p=mTask.git diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl index 4fff9ae..28d44c4 100644 --- a/Devices/mTaskDevice.icl +++ b/Devices/mTaskDevice.icl @@ -82,7 +82,7 @@ deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d) >>| upd (filter ((==)d)) deviceStore @! () -sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, Int) -> Task () +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 @@ -90,7 +90,7 @@ sendToDevice wta mTask (device, timeout) = >>| makeShares sdss >>| sendMessage device msgs >>| makeTask wta -1 - >>= withDevices device o addTask timeout + >>= withDevices device o addTask @! () where sharename i = device.deviceChannels +++ "-" +++ toString i @@ -102,8 +102,8 @@ sendToDevice wta mTask (device, timeout) = \\(i,[d1,d2])<-st.sdss] makeShares = foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ()) - addTask :: Int MTaskTask MTaskDevice -> MTaskDevice - addTask timeout task device = {device & deviceTasks=[task:device.deviceTasks]} + 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) @! ()