werkt nite

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index a1f6e56..46c2b99 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -52,18 +52,20 @@ derive class iTask SerTCP
 
 mTaskTask :: (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
 mTaskTask ch =
-       (enterInformation "Choose" [] >>= \st->case st of
-               Serial = deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch
-               TCP = deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch
-               ) ||-
-       sendMsg msgs ch ||-
-       (
+//     (enterInformation "Choose" [] >>= \st->case st of
+//             Serial = deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch
+//             TCP = deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch
+//             ) ||-
+       deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch ||-
+//     deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch ||-
+       (sendMsg msgs ch >>= \_-> (
                (
                        consumeNetworkStream (processSDSs sdsShares messageShare) ch ||-
                        viewSharedInformation "channels" [ViewWith lens] ch ||-
+                       viewSharedInformation "messages" [] messageShare ||-
                        viewSh sdsShares ch
                ) >>* [OnAction ActionFinish (always shutDown)]
-       )
+       ))
        where
                messageShare :: Shared [String]
                messageShare = sharedStore "mTaskMessagesRecv" []
@@ -104,9 +106,7 @@ mTaskTask ch =
                                )
                        ) ||- viewSh xs ch
 
-               sdsShares = makeShares st
-
-               (msgs, st) = toMessages 500 (toRealByteCode (unMain bc))
+               (msgs, sdsShares) = makeBytecode 500 bc
 
                bc :: Main (ByteCode () Stmt)
                bc = sds \x=1 In sds \pinnetje=1 In {main =
@@ -131,18 +131,16 @@ mTaskTask ch =
                                                digitalWrite D2 (lit True)
                                        )
                                )}
-//             bc :: Main (ByteCode Int Stmt)
-//             bc = sds \x=1 In {main =
-//                     If (x ==. lit 3)
-//                     (x =. lit 1)
-//                     (x =. x +. lit 1) :. pub x}
-
-makeShares :: BCState -> [(Int, Shared Int)]
-makeShares {sdss=[]} = []
-makeShares s=:{sdss=[(i,d):xs]} =
-       [(i, ms ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
+
+makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)])
+makeBytecode timeout bc
+# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc))
+# shares = map (\(i,d)->(i, sharedStore (s i) (dd d))) st.sdss
+= (msgs, shares)
        where
-               ms name i = sdsFocus name (memoryStore name (Just i))
+               s i = "mTaskSDS-" +++ toString i
+               dd [x,y] = (toInt x)*265+(toInt y)
+       
 
 sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
 sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()